tree f44672b3268bf2c3b001cea1ab4113accc236bb3
parent b96be039baa792675bfd4e92052b578c2cd66987
parent 11be6eb68c9a5c8b8de921cc90135a43f6a4ff64
author Xin Li <delphij@google.com> 1633679813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679813 +0000

[automerger skipped] Merge Android 12 am: 7bc98fae04 -s ours am: 251275938e -s ours am: 11be6eb68c -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: I427200e8bfb2162f544977dc6aa78b40cee7ea7b