| commit | 4f5321ba7d8ba2b54612a443a9e04ef43994ae35 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:55:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:55:24 2020 +0000 |
| tree | 9a27a0c03fead8a272fee4aa39df9df7c141eb3b | |
| parent | bd179d06dd485a0ac0688347c0981f013e8f16fa [diff] | |
| parent | 24daf02a1b3503c4df5e4b2f4735e47b4b264328 [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 am: 36ffb44fd9 am: 24daf02a1b -s ours am skip reason: subject contains skip directive Change-Id: Ic0ea933cb5eaac54d227d42631c155198fafd227