| commit | a382d36eb3a09818efa29735fcd2751aef4b9fdb | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 22:42:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 22:42:37 2023 +0000 |
| tree | 868fe47ec8252c3d6c0725f26b03e19726ca5d35 | |
| parent | cb041e53ffa759009ce07afe455d741645334a59 [diff] | |
| parent | 8c4fe923488a6a70c5582dc1fa11409fb7e3296e [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 3198390ed5 -s ours am: 0fb54c55a0 -s ours am: 8c4fe92348 -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: I1710b3f5f3f784c828959f7243d6298a79d25988 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>