| commit | 36ffb44fd95d35af521f20b2c2616a1eb9ab1a09 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:41:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:41:52 2020 +0000 |
| tree | 7e875a379440994749cced2aeae5ccee1ca8992c | |
| parent | 12dced03278fcbeb8dff3b11547b44127434eb60 [diff] | |
| parent | c1ebbd3210bece75969eaab85950f271f355a716 [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 Change-Id: I65d305b0b1af0a667b06e83a6b4894c4fc4cc02f