| commit | ed28ec5313110479f99996c508209e63e112d971 | [log] [tgz] |
|---|---|---|
| author | Austin O'Neil <austinoneil@google.com> | Tue Jun 28 23:01:10 2022 +0000 |
| committer | Austin O'Neil <austinoneil@google.com> | Wed Jun 29 17:25:31 2022 +0000 |
| tree | e24d1911ca98540ba9cdc761fd850f4f3c927543 | |
| parent | 28923a9bee6718b5065ca993395769e8bb15064f [diff] | |
| parent | aeacccbd3ee4eeaab6384e0edc379776482cbc3f [diff] |
[conflict] Merge "[conflict] Merge "[CTS V] Skip Device Owner > Disable Keyguard test on Wear devices" into android11-tests-dev am: 0d7216391e" into android12-tests-dev am: aeacccbd3e Original change: https://android-review.googlesource.com/c/platform/cts/+/2137232 Change-Id: Ia8e16a7a3580ee66703f9f1724267993730d5093 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>