| commit | ba5afa5b0cba6a7bdd194b3ff752a52e681e4ae9 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:34:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:34:24 2023 +0000 |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 | |
| parent | 44ce622af0d75e849c9e415440300f9b84f8bae4 [diff] | |
| parent | dfb12788aa01558447e425176b7b63cb750db264 [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: 4f2e609bf5 -s ours am: a35a9e67c0 -s ours am: dfb12788aa -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: I54ee5828873dec999881931354669aeab4c72026 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>