commit | f4b8f6ad2211ba203b80b15f0cd1595eda7c6203 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 20:56:13 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 20:56:13 2023 +0000 |
tree | bab5d22478d8123cad6849e7ab59fad798444e64 | |
parent | 63d7a8779239c4172c66f4391329ed9f3188bc80 [diff] | |
parent | 727968f0d92b95184b4a331ae711466a6d548709 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 727968f0d9 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I404b2f03120a338b3d77fbfbe2b0bec0bcaed4b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>