tree 31d977c9424fff6f4e0d791dc6c1512bcd968c76
parent ae47ccf7eabe9f4762bc507d323ae62b870fe661
parent adefc057881d71a16343151a5298609d81cb821e
author Xin Li <delphij@google.com> 1633657193 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657193 +0000

[automerger skipped] Merge "Merge Android 12" am: 3c2f8349f2 -s ours am: adefc05788 -s ours

am skip reason: Merged-In Ibf274d5809120d2ca58dd35865d8ec0a76b9925a with SHA-1 0ce1327bf5 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1847953

Change-Id: I2cee5e728a3616db66f3fe04a8e6f2b0bca07419