commit | 7bbef22008101c5263974e68daba777a36832d07 | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Tue May 14 12:08:45 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 14 12:08:45 2019 +0000 |
tree | 9cb75d2f7e31468b41bf4a607ddc10d9e2908e1c | |
parent | 4dd3e096423bba185eb6a64dffbd73fabfa591e5 [diff] | |
parent | fc8f6843f55fd5dcbdfebc5cfc0b323a358f34f1 [diff] |
Merge "[automerger skipped] 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 am: d90fd6c0c8 -s ours am skip reason: SHA1 d90fd6c0c8 skipped by user paulcrowley" into oreo-mr1-cts-dev