| commit | 2cd732417b15b1a5655178fdcaa29a0c240b3013 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 27 17:11:38 2022 +0000 |
| committer | Pavel Grafov <pgrafov@google.com> | Tue Jun 28 09:58:57 2022 +0000 |
| tree | 44f905740eb8f8269bf91d88fdd194e443bad862 | |
| parent | f87d3307c599786de6c225021ce6b0a8fd645730 [diff] | |
| parent | 0d7216391ead38fc7b61b9ab34a40192ff4d0bed [diff] |
[conflict] Merge "[CTS V] Skip Device Owner > Disable Keyguard test on Wear devices" into android11-tests-dev am: 0d7216391e Original change: https://android-review.googlesource.com/c/platform/cts/+/2133406 Change-Id: If14cc0bf0cd5565014a853242a574bb14a949f90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>