| commit | 80dbcd898e1627a9d43e55abc322640d64a668ea | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Thu May 23 02:08:51 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu May 23 02:08:51 2019 +0000 |
| tree | 01f9cf61f3916b533d8db9c3baa819a02453e691 | |
| parent | 950e66cc1caf4552238460273a5d6a4d996a9365 [diff] | |
| parent | d1d582313bcdf144dc1e450caaa1ffc3faf56ad6 [diff] |
Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-mr1-cts-dev am: d606a8121b -s ours am: 42353da5ac -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev