tree ab459e985b6dd4dcbb674098727da80017aa5122
parent a34ace7a506eaa95db12179518076ddd701dc959
parent d95cd78596c4b8d9a3b0203765510f04e93dff46
author Xin Li <delphij@google.com> 1660690881 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660690881 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: d95cd78596 -s ours

am skip reason: Merged-In Ib2149628356c413925eb3cf2fc88c6af0874c830 with SHA-1 e7c0bd3689 is already in history

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

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