| commit | 3307ef05ee62444a994e2aa28b36866b73cbeac8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 19:44:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 19:44:18 2023 +0000 |
| tree | 0040108134d92de2f01c084a410543bfe8dd261e | |
| parent | 3afc843a657e906e34f269192c995822fe01d30c [diff] | |
| parent | 3815edc6e2e8cc8c3417c460035636d52ee1716e [diff] |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours am: 3815edc6e2 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286 Change-Id: I4968b1f20b9682a786fbf913c429d6e48e79e09b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>