| commit | d4eb14b9d4797ae3ae319753561a3fe3a8c81f1f | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue May 14 05:06:36 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 14 05:06:36 2019 -0700 |
| tree | e6027d876c86f458c771121a4e564e4e3cc3edd0 | |
| parent | 7df0289d61b20b872839a00cfd0dc4cc7a46c3e2 [diff] | |
| parent | 28dbbd531de0f1cd2e7c104123d9f0d7631639e2 [diff] |
[automerger skipped] Merge "Merge "Revert "testEncryption for device without secure lock screen"" into nougat-cts-dev am: 6c01bccdc8" into nougat-mr1-cts-dev am: 28dbbd531d -s ours am skip reason: SHA1 28dbbd531d skipped by user paulcrowley Change-Id: I1b17092cb70b64baa7fffb3d37f16386e38a331f