| commit | 0fb54c55a07ce97e7406c6d887bf17e23e447796 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 20:55:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:55:22 2023 +0000 |
| tree | 39b48017ca8bc4a7a222a4eafb5ca64f362f2d3c | |
| parent | e6d97ec3d0bc1cde931027591cff1c1f7c4663ad [diff] | |
| parent | 3198390ed55fa11b7d2886d72e9ad7b682ef89db [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 3198390ed5 -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: I762e03a64a413e6a6854e69f74698a4459065b04 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>