| commit | 050cb4b224cf23521dcb56d19090247d7963e9b2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 21:36:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:36:27 2023 +0000 |
| tree | 32509152093be4a1acc7902196ee1bcfd70584c4 | |
| parent | 100f2fd86aba5a14c5e4b8b4146e329e36d3c48b [diff] | |
| parent | eca5af7099bcd964eee26c5034d4fc588bf2e55e [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 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: Ib047c5df753d32b921e5ace7356b022b551fc348 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>