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