tree 6e4d5d130a2f2e6047a87ed4b5780ce3d64458a7
parent 20916d56e292ba673b4530cb1dd031016c3a1606
parent 11ea0d5e1ecf518abeaa73f6c3ffcc193f053315
author Xin Li <delphij@google.com> 1633681785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681785 +0000

[automerger skipped] Merge "Merge Android 12" am: 417e4997a4 -s ours am: f43e89aa2c -s ours am: f24dc4ea4b -s ours am: 11ea0d5e1e -s ours

am skip reason: Merged-In I9494082d36af92b66ff4fc7551d3659b9b51d8ea with SHA-1 8f11dea13b is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/build/+/1848036

Change-Id: I081fd984d956b38414bd4f4843ea4abc019ad774