tree f44672b3268bf2c3b001cea1ab4113accc236bb3
parent af3721a1f683ad21a118cddf81edaa19a47a481a
parent bfeae14ba39bc95c5e722d67007d079c9f5b527c
author Xin Li <delphij@google.com> 1633681791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681791 +0000

[automerger skipped] Merge Android 12 am: 7bc98fae04 -s ours am: 251275938e -s ours am: 11be6eb68c -s ours am: bfeae14ba3 -s ours

am skip reason: Merged-In I8f169fca607c40fb9961ff5bf288953bb4a4b768 with SHA-1 b641788cc6 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1847447

Change-Id: Idbbf504e35e20bc431d0b65f491d812263f00240