| commit | 25f13398f87111aa9d2b18a83f9c20a562052a5d | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:30:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:30:14 2020 +0000 |
| tree | 2c41a544f4c64ab750883ca6a72e7fb91e368078 | |
| parent | d209a42792e2fd14c6450ddba53bd173d35fd924 [diff] | |
| parent | 02bf4869c2c9152c9fba416b20ef85b8bfeffb82 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0 am: 4dd9f6e113 -s ours am: 75b8097bc2 am: f44c574016 am: bfc578a7d7 am: 02bf4869c2 Change-Id: I87dec9b1aa62cc46edb5c6859aba1959f4bfe6f1