diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-01 19:54:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-01 19:54:05 +0000 |
| commit | c437e5d8e0be2ab053a33d5f1d7a6d4a0a779668 (patch) | |
| tree | b55ff98551cfb13a31503e4e1aa500b2caac903f | |
| parent | e421069f3b204afd9d6e328fdf4b4a33fabb193c (diff) | |
| parent | 70f66e3c31f1c1f76580989a27fb77d0ab9a1d0a (diff) | |
| download | cts-c437e5d8e0be2ab053a33d5f1d7a6d4a0a779668.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: 70f66e3c31 -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: I4d3f6a5d91c800dc08733de60666c015020ad449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions