| commit | d2983294ed774099d4c44a001e030c18d6e8906d | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 19:51:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 19:51:46 2023 +0000 |
| tree | 635af0b0d3ced0391f9aca13b4c7de92cb1d10e3 | |
| parent | fd2e885b983f08c34b4a0bb6c7e152922e28fb46 [diff] | |
| parent | b708c4f32ed4ee7e2cddad6e1e7e7baa73aa55c9 [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Ie9c47ae9b610667728fa399179783331d1218bbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>