| commit | 39bfab220ac43bcab7a8f944f994b6d7090b69f0 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 20:52:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:52:35 2023 +0000 |
| tree | 39b48017ca8bc4a7a222a4eafb5ca64f362f2d3c | |
| parent | dbc28f0c281e662a210a9f57425c87efb90b83aa [diff] | |
| parent | 02912212c5014fc65b40946b926457239f98f9b3 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 02912212c5 -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: Iec89433e121def81b92a6c0312924c65f4ea9991 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>