| commit | e6d97ec3d0bc1cde931027591cff1c1f7c4663ad | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 20:53:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:53:02 2023 +0000 |
| tree | 39b48017ca8bc4a7a222a4eafb5ca64f362f2d3c | |
| parent | 39bfab220ac43bcab7a8f944f994b6d7090b69f0 [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: I95ed3d56769a0a6e931c8f5ab5f43f61d0e1d71e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>