| commit | 749d17059222463496c1b8a44bfde870414f3485 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 20:55:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:55:17 2023 +0000 |
| tree | 395403f819289bec012abd32dfe4a3a551313d25 | |
| parent | 44261334bfb3f069707cb07dc52c33b526fc499a [diff] | |
| parent | fd2e885b983f08c34b4a0bb6c7e152922e28fb46 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: fd2e885b98 -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: I2506aa8f30d49f16274c255fc02c97ea2dbf2747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>