| commit | 7c36ae99de7008cdf870a995f5c738228b0ddf16 | [log] [tgz] |
|---|---|---|
| author | Ryohei Takeuchi <takeuchi.ryohei@sts-tottori.com> | Wed May 22 23:11:10 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 22 23:11:10 2019 -0700 |
| tree | 95a3a99d15c86cd75b6f5b83032725912cd9f651 | |
| parent | 37719f5d224b503448055a56a13c45224fc7f76d [diff] | |
| parent | a3b4e8ee56a89a299b27ca2569bc9e4a7817ef3b [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: 80dbcd898e -s ours am: a3b4e8ee56 -s ours am skip reason: subject contains skip directive Change-Id: I8967c928ce0634e5608286c12858cef793c66d76