| commit | 75b8097bc20986f10201aa294e0c29fcfa64a25d | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 18:16:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 18:16:12 2020 +0000 |
| tree | 634aa9f9ab52a5890b2536215add29d81f403925 | |
| parent | ab7aef5c70f3a9435334d8ba2aa760e626ea0a95 [diff] | |
| parent | 4dd9f6e11369699036e8e35f9620613990b1ca7b [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0 am: 4dd9f6e113 -s ours am skip reason: subject contains skip directive Change-Id: I17439186e0b44bd0375a215836594a20a7a9064a