| commit | 40cb1d90eab01ed88fdf8e89ef56393988a2ee7e | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:42:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:42:02 2020 +0000 |
| tree | 89559f0edcec5aef87241e6b367c88e48235e8f3 | |
| parent | 155206bfe76edebb0307808acfb8e6a959f41eb1 [diff] | |
| parent | 7772ddc1b6b97a080320233e3eccf08a44ce3b17 [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: 9be6d3a41b am: 7772ddc1b6 Change-Id: I36a0d54449464b9f48bca9526918c8e50ce9e4a6