| commit | f48bff80a2f7271a9378c471fdc63ff81f8e73b6 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Wed May 22 23:45:15 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 22 23:45:15 2019 -0700 |
| tree | 95a3a99d15c86cd75b6f5b83032725912cd9f651 | |
| parent | b4835b404819bbc6dbf0c70b0ee5fb6248334264 [diff] | |
| parent | ebe80220aaeeef0ea4fcab875130612200a0e04b [diff] |
Merge "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: 80dbcd898e -s ours am: ebe80220aa -s ours am skip reason: subject contains skip directive Change-Id: Id4bb92638ab0ade7b7b80d746d9f1bb9980ef040