| commit | ec596d91276f911805a81c15a5dfefc18f566356 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:43:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:43:34 2020 +0000 |
| tree | 5a81aeaff024c20bac5bbabff670e294560af2ae | |
| parent | f8a23c732404ee4105435bd24e06017507e2d7c3 [diff] | |
| parent | 76cbb34354c435a80c0fffac4ce20245ea72b834 [diff] |
Merge "[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" into rvc-d1-dev-plus-aosp am: 76cbb34354 Change-Id: I0ec72923f49ded7350c3fd4a33a8d93047a78e09