commit | 4dd3e096423bba185eb6a64dffbd73fabfa591e5 | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Tue May 14 04:16:18 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 14 04:16:18 2019 +0000 |
tree | 9cb75d2f7e31468b41bf4a607ddc10d9e2908e1c | |
parent | 2843571865bb0aeec1c4d8963af75a4a7a13a4ef [diff] | |
parent | a6c9576adfa6c3221e89691ab3b585123005445c [diff] |
Merge "[automerger skipped] Merge "Merge "Merge "testEncryption for device without secure lock screen" into nougat-cts-dev am: a138b9c582" into nougat-mr1-cts-dev am: bec9ad25c4" into oreo-cts-dev am: fefb71b8fa -s ours am skip reason: SHA1 fefb71b8fa skipped by user paulcrowley" into oreo-mr1-cts-dev