| commit | 6b43a383455a7284701207a9ef9f6198acc15ddf | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:52:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:52:50 2023 +0000 |
| tree | 0197dbf06a9533f2900b62e545a8e75cb4a4adf9 | |
| parent | dc974fbaf9e726519b4682971e01121e23a754f3 [diff] | |
| parent | 155481e1e903d62d4d997b0fcad42c0919e642fe [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 727968f0d9 -s ours am: f4b8f6ad22 -s ours am: 3e6f7a7f04 -s ours am: 155481e1e9 -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: Ia6c9c4302e9230ac182a529143a46128bd463f78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>