| commit | 58bc49da23df9a80f5430f45b3f91378223604e4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:39:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:39:55 2023 +0000 |
| tree | 2727a1c537f41f85d3d4d6bba2dd2125b9506ac1 | |
| parent | 4f60913bc98fdca8e830fb036d16f1f818f2e2dd [diff] | |
| parent | 475d79883f4f379079d1af9b4e1bab52c5f0ba6c [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d34974d am: 98df1c6e3f am: 775cbd02d7 am: ae62a32de6 -s ours am: 5200fce012 -s ours am: ad73da7f08 -s ours am: a7ed76fe35 -s ours am: f92f9ce287 -s ours am: 475d79883f -s ours am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3b9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805807 Change-Id: Id4e1747ec43b034a0deb6ca1d19c785658c8a12e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>