commit | 63bba1ed7bce2113efa02152e89bead904c27b48 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:55 2020 +0000 |
tree | 01917199021d1e83592c116d386bda50ba851c99 | |
parent | 7ed38612d5053c89eab556a9818ba3fe9403674e [diff] | |
parent | 4af33b353fbf5f0d955fc6f8d2de2a9211a1ae12 [diff] |
[automerger skipped] Merge "Merge Android R" am: e109a7fe68 -s ours am: 4af33b353f -s ours am skip reason: Change-Id I7cd4345e89ff7914cdf64d33f798c47d1169e3a3 with SHA-1 c2b945ddfa is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1422568 Change-Id: Ia5786f4c4bdedc40161946152fe3f8dce0c65e28