| commit | 012749c0e88d25865dcaa07bbd8c34e581a1853e | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 20:44:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:44:48 2023 +0000 |
| tree | 14d89ece7ac7cfe6fbcd54e2e9ebaa5b286c1b79 | |
| parent | 2923e0bdef6ea8598bb2419747a6b1082ee4df21 [diff] | |
| parent | 3ee339a4a38c63229c5acdb973bc85e7b8ff73a8 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: 3ee339a4a3 -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: I7bd36808c7c0d6312c3bf504b2316f1cdb970c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>