| commit | 7b474f9d1378322e3b71aed7a2f3416a1bb6354a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 22:07:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:07:49 2023 +0000 |
| tree | 3482372e29f773dfa645f76969263812a91b8373 | |
| parent | f2a8f5787a4b392341f792e4ed428161c2b5d4e3 [diff] | |
| parent | dc974fbaf9e726519b4682971e01121e23a754f3 [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: dc974fbaf9 -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: I45f04e09aceefd60af483b86cf15d5dfa63a9ba6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>