| commit | 21118e5388ee70d610c5e7b96feced8154a07b5c | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Wed May 22 14:33:29 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 22 14:33:29 2019 -0700 |
| tree | f8e9084af76afb07c53819575f8108f84c5ba252 | |
| parent | 42353da5ac611dfc04cb4457ce1f63dc8bb80be3 [diff] | |
| parent | e0a2ff6ca0c12f089f5aa00db806d513daa4096d [diff] |
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 Change-Id: Ia95b41fe0b373be0418c811a80fcc452fd94befd