| commit | c5ff36a5da09ef5c199757df8d40d5489e8b012f | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Wed May 22 21:33:43 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 22 21:33:43 2019 +0000 |
| tree | f8e9084af76afb07c53819575f8108f84c5ba252 | |
| parent | 42353da5ac611dfc04cb4457ce1f63dc8bb80be3 [diff] | |
| parent | 21118e5388ee70d610c5e7b96feced8154a07b5c [diff] |
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 skip reason: subject contains skip directive" into oreo-cts-dev