| commit | 24daf02a1b3503c4df5e4b2f4735e47b4b264328 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:55:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:55:09 2020 +0000 |
| tree | 5a81aeaff024c20bac5bbabff670e294560af2ae | |
| parent | 01a36ef319103d4d5cc937ccfc31bede197bab4b [diff] | |
| parent | 36ffb44fd95d35af521f20b2c2616a1eb9ab1a09 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev am: 95d9a6c11c -s ours am: e3a1235c4b am: 8c91c69d32 -s ours am: 9f0317bdd2 am: 40511521d9 am: c1ebbd3210 am: 36ffb44fd9 Change-Id: I70b7a0996602ece71d9931678765f5fd1d8140c2