| commit | a2838071f03180346613b40790e272ed4eaf33c3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 22:24:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:24:11 2023 +0000 |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 | |
| parent | 31932de7cddb0fcb6c27f555fc5d13aa9d23b2f4 [diff] | |
| parent | a8428518dd0b07d3548006e01fb0088c1e285e6f [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: f56e799c49 -s ours am: 0dd2ab72fa -s ours am: a8428518dd -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: I48597f02c3a827fef34fda32dc99b17065b2f58f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>