| commit | d7f94d248efb8ee0dbdbacdaf948862cfdb9d019 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 02 22:09:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:09:00 2023 +0000 |
| tree | 0197dbf06a9533f2900b62e545a8e75cb4a4adf9 | |
| parent | 5cc86d4c7cb65eaf98154dac842fda8c23db1922 [diff] | |
| parent | f7e217a73f1542f44b5a372f0ce2d3f9285b16fe [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: f7e217a73f -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: Ia5bec655bafc60b252a1a8962777796396f5aeab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>