| commit | bc8cd50cd3f3033fe9756543c406cc4ad8664bf1 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 22:44:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 22:44:08 2023 +0000 |
| tree | 868fe47ec8252c3d6c0725f26b03e19726ca5d35 | |
| parent | af953d541f905862688b43778217995054dd3e29 [diff] | |
| parent | f89dc776ac94f0ab1aeef11d88f208b797ea072c [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 02912212c5 -s ours am: 2923e0bdef -s ours am: f89dc776ac -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: Iaa6333ca2f2dbe71ddd14dd12e71f74b5dc2879a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>