tree 4d5e2e2eaefd2079769f31f00d42a747f77276c4
parent ea077881a587396e19d7d53998ec9a94bce9779a
parent 42543ffd772ace36c27776c2eb50f6435870bcdd
author Xin Li <delphij@google.com> 1633657143 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657143 +0000

[automerger skipped] Merge Android 12 am: 680dbbf82e -s ours am: 42543ffd77 -s ours

am skip reason: Merged-In I9073b1d993316cc77947ac1ede4bd33a05f0960e with SHA-1 a57e9e6f24 is already in history

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

Change-Id: I823df4275b1ffabc9b7fe56e8c6d80cd7f456e34