tree 6e4d5d130a2f2e6047a87ed4b5780ce3d64458a7
parent b56074854c1f0f72a44bcdd0379f391b75dbd9e1
parent f24dc4ea4b16c0f63481aa5f5e0d15b7ea99a82d
author Xin Li <delphij@google.com> 1633679807 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679807 +0000

[automerger skipped] Merge "Merge Android 12" am: 417e4997a4 -s ours am: f43e89aa2c -s ours am: f24dc4ea4b -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: I70e68ea10c4da9c117c6124a949646c222974bb3