| commit | cb041e53ffa759009ce07afe455d741645334a59 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 22:40:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 22:40:48 2023 +0000 |
| tree | 868fe47ec8252c3d6c0725f26b03e19726ca5d35 | |
| parent | c64e39ede8576547d657c600e2bfc44b5ee9e353 [diff] | |
| parent | fc88418591cb6411df31740dd84e0f95ef148ff8 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: 3ee339a4a3 -s ours am: e6d97ec3d0 -s ours am: fc88418591 -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: I7fee4df6233047b3a0feb0dece19d7844fe50f69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>