| commit | 2aa09ced42c83807232324c4fb8c3c8c0918e39b | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:52:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 04 19:52:03 2020 +0000 |
| tree | e4b3cc2e6e2453fcaa5865f920c724fee5bd0087 | |
| parent | bc10dfdec16dd3394276b33a7126582990d39787 [diff] | |
| parent | 40cb1d90eab01ed88fdf8e89ef56393988a2ee7e [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: 9be6d3a41b am: 7772ddc1b6 am: 40cb1d90ea -s ours am skip reason: subject contains skip directive Change-Id: Ic1539075e93ff7ac0427105fdfff3d212db0ba58