diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-01 19:57:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-01 19:57:52 +0000 |
| commit | d32a8d5c3b5e7dca73694f09f330dc5adaba9424 (patch) | |
| tree | 9c31b28dc342e5fd22695263578602e28ba20a56 | |
| parent | 4a89562fe2d1c66912756cb922c83a32d26d6bec (diff) | |
| parent | e824eb7b0ee1a115e188a5d633436340780b4212 (diff) | |
| download | cts-d32a8d5c3b5e7dca73694f09f330dc5adaba9424.tar.gz | |
[automerger skipped] [conflict] Merge "CTS test for Android Security b/179042963" into rvc-dev am: 2247a7bc61 am: c6da1b52c5 am: 8dc430ae53 am: 32562e392f -s ours am: adcd949818 -s ours am: eb3117780a -s ours am: e824eb7b0e -s ours
am skip reason: Merged-In I9c9916337034225278747e2d1fc565fbc77c7ebd with SHA-1 74e521dbdf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/25506414
Change-Id: Iff561a5f9915cc932c749de1391fbfb02561cdf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions