commit | d90fd6c0c86027e1fbbad29b20b04363ff8f66eb | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Tue May 14 02:16:11 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 14 02:16:11 2019 +0000 |
tree | f8e9084af76afb07c53819575f8108f84c5ba252 | |
parent | fefb71b8fa40fd81beb9f82a057d8508a0357735 [diff] | |
parent | d9fd6adf2790ceea0a0e9b6234ba920a7fdfbfdb [diff] |
Merge "Merge "Merge "Revert "testEncryption for device without secure lock screen"" into nougat-cts-dev am: 6c01bccdc8" into nougat-mr1-cts-dev am: 28dbbd531d" into oreo-cts-dev