commit | 8c4fe923488a6a70c5582dc1fa11409fb7e3296e | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 21:37:14 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 21:37:14 2023 +0000 |
tree | 3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 | |
parent | fc88418591cb6411df31740dd84e0f95ef148ff8 [diff] | |
parent | 0fb54c55a07ce97e7406c6d887bf17e23e447796 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 3198390ed5 -s ours am: 0fb54c55a0 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: I9c46736e2a62b511faa74ce51f2d787fc4f8c425 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>