tree f44672b3268bf2c3b001cea1ab4113accc236bb3
parent c1e64b856694c60c6ddd42057705d31f04b44189
parent 11409c7cdc2b1feb5b471f7889558b4dcc4f8622
author Xin Li <delphij@google.com> 1633683601 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683601 +0000

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