commit | 8253470f3c57064f5082bd078e1c886dfe370c61 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue May 14 04:12:40 2019 +0000 |
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue May 14 04:12:40 2019 +0000 |
tree | f107ea3685c16dc8816b40a1229aa23834a53bbb | |
parent | 18af8bb4d7acbd1420767cc20b728b34abb9d174 [diff] | |
parent | 11afe20461c5b5cacb24870922e35fd3106b8f07 [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 skipped: 11afe20461 Change-Id: I4d967dbf26e54a62079cea2c9e4e70fd7f6434e0