tree 8c986e32937c71d62844fdcc8157acc6c3377538
parent 36f43bdd5882445e3fde6c732d9aea0a88f728e0
parent 1fa01d73161467b8f2a0753bca3ec5bfef7bcab1
author Xin Li <delphij@google.com> 1633683587 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683587 +0000

[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -s ours am: 156a09762e -s ours am: 9b8b20c880 -s ours am: 1fa01d7316 -s ours

am skip reason: Merged-In I965e46e02e7c0f58a7d93244526a8b54f63a1913 with SHA-1 d50b4c7322 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/adt-infra/+/1847420

Change-Id: I14a62f806a1c4b4d43980c3723cd69a8afe11158