| commit | 42c2023ded16264b2c67341d408e9ab91717f681 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:29:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:29:58 2020 +0000 |
| tree | 6331d0df0a66af8e9c359832c32b4c3d219bcfc1 | |
| parent | fbc7b7f0f756a14f48e04284118c4ea2e3e9558a [diff] | |
| parent | 40511521d92982b0a9f52144a2e77eed26978c38 [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 Change-Id: I704b18108c5c619cc646a27550ef11d4ac1c0ebf