| commit | f56e799c494b31b9073c4b117c71b4fd15ffa94c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 21:33:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:33:35 2023 +0000 |
| tree | 7a9873d8ef8b3e93bb4ed37038356471af66a2d0 | |
| parent | 4e0df66dea55df3a14e16dda4901ff0be81fe64e [diff] | |
| parent | 742411fe53c5df089552ab1e12516a9cca151698 [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: 3307ef05ee -s ours am: 742411fe53 -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: I015c8e2cd7581eb6b426b85a81a63985075a6126 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>