| commit | aeacccbd3ee4eeaab6384e0edc379776482cbc3f | [log] [tgz] |
|---|---|---|
| author | Austin O'Neil <austinoneil@google.com> | Tue Jun 28 17:28:19 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 28 17:28:19 2022 +0000 |
| tree | 44f905740eb8f8269bf91d88fdd194e443bad862 | |
| parent | f87d3307c599786de6c225021ce6b0a8fd645730 [diff] | |
| parent | 2cd732417b15b1a5655178fdcaa29a0c240b3013 [diff] |
Merge "[conflict] Merge "[CTS V] Skip Device Owner > Disable Keyguard test on Wear devices" into android11-tests-dev am: 0d7216391e" into android12-tests-dev