tree f44672b3268bf2c3b001cea1ab4113accc236bb3
parent 9d9be4799cbc9c0c80b02aad2ba2266d045c9d31
parent af3721a1f683ad21a118cddf81edaa19a47a481a
author Aurimas Liutikas <aurimas@google.com> 1631779229 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631779229 +0000

[automerger skipped] Add manifest-merger 30.1.0-alpha06 am: b641788cc6 -s ours am: 467e64a8c4 -s ours am: b96be039ba -s ours am: af3721a1f6 -s ours

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

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

Change-Id: Ibe65c7698ebaa7dac32f985d7a1538be40396cdc