commit | ac115aa9299cf58610c944ac3321d87a6e5d4ccd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:39:56 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:39:56 2023 +0000 |
tree | 60ae8ec41b8d16efc920e9bc97d5bfdd80c68503 | |
parent | 4eb2d853f9baf951d53d6c3d05392c1981bbcee9 [diff] | |
parent | 81c628fcbd646dd58f86aa36f0b22beafddf18f6 [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours am: fa1bc4a7ef -s ours am: 81c628fcbd -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: Ide67cafb998bfa2004b07ec810dc2f36690993cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>