cb77aae0db762b45ac7871fa6543915f33518024 - platform/cts

commit: cb77aae0db762b45ac7871fa6543915f33518024
[log]
author: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri Jun 07 14:16:27 2024 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri Jun 07 14:16:27 2024 +0000
tree: 0d69c19abb76cd1e2fa65f0cf3461c7735c275eb
parent: 241bcc11ad4ae710e99432a1656fa8b064532d02 [diff]
parent: 314da473c0915e53d7c4ba6fcc6eea1ddd66f544 [diff]

Merge changes from topic "am-a38db4382a1d4e41b69505f97e0d2972" into main am: 314da473c0 -s ours

am skip reason: Merged-In I434a371064607ccb02a5abb35b4bb81abb045c39 with SHA-1 8b290cdb33 is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/3117516

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

tree: 0d69c19abb76cd1e2fa65f0cf3461c7735c275eb