| commit | c1ebbd3210bece75969eaab85950f271f355a716 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:29:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:29:15 2020 +0000 |
| tree | 7e875a379440994749cced2aeae5ccee1ca8992c | |
| parent | 2814ccb2f00fc06e56ccce8399bd668791db94b8 [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: Ie64c93f16168771a35cc8a7ecf61f3a8e6284404