commit | 9b4ab43d7bface1b04058a20f455c16b066d774e | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 21:47:08 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 21:47:08 2023 +0000 |
tree | 518603ed28bf11e55bef2f021050993fef95d5d5 | |
parent | 0ef05eedea27c0839e8a4e02a746a840fe7c53ae [diff] | |
parent | ad73da7f089275c06c8187492b2dc393e969e4aa [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d34974d am: 98df1c6e3f am: 775cbd02d7 am: ae62a32de6 -s ours am: 5200fce012 -s ours am: ad73da7f08 -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3b9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Idcf2b1f3692c26c4ebac018cc6807b17e80dc9f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>