commit | 87c4a9300250f3e401277c1a4f48bc95e230ee01 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:24 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:24 2020 +0000 |
tree | 66441081fb1531925f3cb38745a0f2ae7ca9ad04 | |
parent | ee2f302e99aa4d4defc453fc201d02c78c9c9587 [diff] | |
parent | b0c77871b0770d9203f7548255dc1c13c0366e7e [diff] |
[automerger skipped] Merge Android R am: 785c2bcbe6 -s ours am: eb3ab2267e -s ours am: f31d1ca5a0 -s ours am: b0c77871b0 -s ours am skip reason: Change-Id Ia8ae3d390e8ce65cc391f18eb2faba68701d32d4 with SHA-1 a7aaaa718a is in history Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1422308 Change-Id: Ia8b2b0b1374a5bbaa8585f6d85e1e2351c40d5d7