| commit | 9be6d3a41bd3438ac9d3e3792b85b3c78ebf3a39 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 18:46:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 18:46:43 2020 +0000 |
| tree | 89559f0edcec5aef87241e6b367c88e48235e8f3 | |
| parent | 0e1cfdfbc11eb75824c81699c91ee1f7d7951e81 [diff] | |
| parent | 9f0317bdd2354abe4c6cea4b9369735903aa4c1e [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 Change-Id: I8241a2716755b53edcf937d7526a9eba9fadb44b