commit | 11afe20461c5b5cacb24870922e35fd3106b8f07 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue May 14 04:12:37 2019 +0000 |
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue May 14 04:12:37 2019 +0000 |
tree | 93850c598f353a239547dd8f6cc96aa97d1cd56f | |
parent | 7d94d0bbd5d02ecee2aab97bb0c34a1b4b8aee57 [diff] | |
parent | 7df0289d61b20b872839a00cfd0dc4cc7a46c3e2 [diff] |
[automerger skipped] Merge "Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582" into nougat-mr1-cts-dev am: bec9ad25c4 -s ours am skip reason: SHA1 bec9ad25c4 skipped by user paulcrowley skipped: 7df0289d61 Change-Id: I91cb2646d927300409dcdb7c3da5c9b5ac8450b5