| commit | 896c255adfa9b0edd7d664fd2f9de897b1e3a1ff | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 22:51:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 22:51:07 2023 +0000 |
| tree | b91b0a641ea2c99af6e01a66c1ecc670b717772f | |
| parent | fa1bc4a7efd5d6bb82d215160cefa73918cae54b [diff] | |
| parent | 0b5a34c25795ddd49f80f321a02414cc7d8d4ef9 [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: 9b4ab43d7b -s ours am: 0b5a34c257 -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: I7455d085ce1b9020882c2c6e2710dd0f8fa01ec3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>