| commit | 224fa1da3b4b56ff14582471eb29585936cb214c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 20:56:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 20:56:18 2023 +0000 |
| tree | bab5d22478d8123cad6849e7ab59fad798444e64 | |
| parent | f4b8f6ad2211ba203b80b15f0cd1595eda7c6203 [diff] | |
| parent | 8465fe5d8b8e4f04452c2c40adf9b96cf45e48a3 [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 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: I653d4857ef7aa43f182fb3d9c757edfcdb125d70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>