| commit | 4e0df66dea55df3a14e16dda4901ff0be81fe64e | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:33:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:33:30 2023 +0000 |
| tree | 7a9873d8ef8b3e93bb4ed37038356471af66a2d0 | |
| parent | 1e756e783b5ee12d17607d6e7b738d75cf7ee0d0 [diff] | |
| parent | e7ec6b0aa0f6ac2643d7f5788c53b87bc89a1970 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 3afc843a65 -s ours am: e7ec6b0aa0 -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: I866265d0291fdcf11eba7f1e70d783acd9738bc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>