| commit | 77c7249c6e187d711c308a4283fa0ae79bff06b6 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Thu May 23 05:40:47 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu May 23 05:40:47 2019 +0000 |
| tree | 281ebb43af6eda6db425aad14ca2632e442222fc | |
| parent | ebe80220aaeeef0ea4fcab875130612200a0e04b [diff] | |
| parent | 5d8fd70605505a9b0ad504ac869466c8809eef87 [diff] |
Merge "Merge "Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aaf6 -s ours am: e0a2ff6ca0 -s ours am: c5ff36a5da -s ours am: 7f27517311 -s ours am skip reason: subject contains skip directive" into pie-cts-dev