| commit | 8465fe5d8b8e4f04452c2c40adf9b96cf45e48a3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 19:44:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 19:44:30 2023 +0000 |
| tree | 905141c23b43ad7159fa8ec9302c80dd57592d76 | |
| parent | 727968f0d92b95184b4a331ae711466a6d548709 [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: I0d8fb3bb501396c983bbeb7508a4fd4f060d4fc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>