tree 8c986e32937c71d62844fdcc8157acc6c3377538
parent 3c8be6ebe6014697f552214214e68a85b2cb474d
parent b12ffeee7f0777fb85d9c1244182989af87b460d
author Xin Li <delphij@google.com> 1633657163 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657163 +0000

[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -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: I1c8e8f3c8777fd3733afc50562ce1a15c11a4135