| commit | e0a2ff6ca0c12f089f5aa00db806d513daa4096d | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Wed May 22 21:28:03 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 22 21:28:03 2019 +0000 |
| tree | ef6129679745280878c94f30bdeaebbf5e537373 | |
| parent | d606a8121bad4988af63f1b5af04d0c4566b46ac [diff] | |
| parent | 5d7c3056cfeed9436a77847eeea8545ab8b515bd [diff] |
Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aaf6 -s ours am skip reason: subject contains skip directive" into nougat-mr1-cts-dev