| commit | 742411fe53c5df089552ab1e12516a9cca151698 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 02 21:04:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 21:04:54 2023 +0000 |
| tree | c126fa3c3ec3dc758f8e81c97531efd221df652d | |
| parent | e7ec6b0aa0f6ac2643d7f5788c53b87bc89a1970 [diff] | |
| parent | 3307ef05ee62444a994e2aa28b36866b73cbeac8 [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 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: Ib7bc9bb689903b04d98e2225710369813a8125d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>