| commit | aa9545a7a592d842a1d23283694c6d00ce5e9ee6 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:27:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:27:44 2023 +0000 |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 | |
| parent | a2838071f03180346613b40790e272ed4eaf33c3 [diff] | |
| parent | 65a35c5faea55a8ac57b40473a73634c1c6cb7e1 [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: f6ed64e1ab -s ours am: 65a35c5fae -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: If6338ca0dc05b93b766aa7e3ec33e0786f22bcc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>