| commit | f7e217a73f1542f44b5a372f0ce2d3f9285b16fe | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 21:35:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:35:50 2023 +0000 |
| tree | 83b4b49f666116b3794c208fd9a663ca2a33795e | |
| parent | b0b8877bf30dc8ab66571e70846d081db9764c7d [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: I1d47e98dbd01f083778b406ba42d1e0427f37c32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>