| commit | 1b6669025b4f99bf0e2092949a3ce846ea668a18 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue May 14 10:36:27 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 14 10:36:27 2019 -0700 |
| tree | f7b484a2b6bce2a0d350dd7538a35c35b275006f | |
| parent | cb9b72bc97bc6a8871a7c7c743db293dce9a1757 [diff] | |
| parent | f9bb06d6f6aa1191a4d6016b5514855c5bb7e001 [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: 7bbef22008 -s ours am: 073fe83fb4 -s ours am: f9bb06d6f6 -s ours am skip reason: change_id I8e27cc37994ed614fb67087866b636dc61b53cb8 with SHA1 98dc9b7158 is in history Change-Id: Ic56a6216c0930afd82e4e79b95f98f084299da42