commit | ad73da7f089275c06c8187492b2dc393e969e4aa | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 21:15:36 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 21:15:36 2023 +0000 |
tree | 81b8cbadc05ea7896a313269474568465fb54bb0 | |
parent | 4f2e9968e8a2566603284bb0101ce2e1f2c2dcd5 [diff] | |
parent | 5200fce012c7ba698c6856fde1b88b40fc031180 [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 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: I0c46781075fd0e08b4413a59304b722a72a59de3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>