tree e67f720984bacb763fa054c650e0163bf695e3e3
parent 4c93650f4242d427ffc98856651f59e109be7203
parent 41a9aef732469e72b20103ce4e1958732151c6ef
author Xin Li <delphij@google.com> 1599796752 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796752 +0000

[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 -s ours am: ba680f7a20 -s ours am: 41a9aef732 -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: I8f9a0c084b393445dc9dc8f617fd410bf4b742fa