| commit | cfd9f9deb57cb4f1dfde8b0da286b05b43f6b387 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 22:10:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:10:47 2023 +0000 |
| tree | 0197dbf06a9533f2900b62e545a8e75cb4a4adf9 | |
| parent | a35a9e67c05ee1e1533b01c0c7bb9e2c29b86a80 [diff] | |
| parent | 05f642e2317832856a21b57662d271946a776622 [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: 8465fe5d8b -s ours am: 224fa1da3b -s ours am: eca5af7099 -s ours am: 05f642e231 -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: Ie2e34303fef5964c7933f0695b841d47035006c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>