tree e67f720984bacb763fa054c650e0163bf695e3e3
parent 5c2c6f4e078aa4b4da409cf9cd784a6736e58c2e
parent 8c968172f31added8f10b74144eaec23ffffb846
author Xin Li <delphij@google.com> 1599859662 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859662 +0000

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