| commit | 12913fd3275ea398b700a6f29e6597fbc0b7968d | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 18:30:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 18:30:50 2023 +0000 |
| tree | 90c7c858d678c5e770e13fee695566c468cdd49c | |
| parent | 3cc2961046698867bf6ce50c96361520fbc36ffb [diff] | |
| parent | 996896e672f28aa96a3d8158192de3cd4a105bc3 [diff] |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090199 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: Ie5c740cd3915822597a657b438cda181ec93f4c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>