| commit | fc88418591cb6411df31740dd84e0f95ef148ff8 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 22 21:35:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 21:35:20 2023 +0000 |
| tree | 3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 | |
| parent | 309eb70c15ebb79f8ac0a32617738e5126a0d466 [diff] | |
| parent | e6d97ec3d0bc1cde931027591cff1c1f7c4663ad [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 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: I297e7830188f7d57cb78d084a8b60b6b36b5f085 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>