tree ab459e985b6dd4dcbb674098727da80017aa5122
parent 504c8c105b63a0cb3987c31923f7c3e62cbfac6f
parent 63c6ef2b0855c1e4f450bd3522f11b8dad9b0f53
author Xin Li <delphij@google.com> 1648954063 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648954063 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: eaa215d060 -s ours am: 63c6ef2b08 -s ours

am skip reason: Merged-In I1d276d382989f4ccec94375b0de2241af08a4945 with SHA-1 1d096cb0d5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/cts-root/+/17544767

Change-Id: I184b22639fef273a6728f6b9dea56be2620810c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>