commit | ba680f7a20c52273e7af3dc87693a7bccca192db | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:51 2020 +0000 |
tree | e67f720984bacb763fa054c650e0163bf695e3e3 | |
parent | 8bac6b97c4bd02bba4d51f584de18062584fe339 [diff] | |
parent | 970a231764305d10c6f63e05132cd13f9e808c78 [diff] |
[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: Ie2ff90ed17c1ef395ce8fc75a98cf4397d03ad4e