| commit | a1750e6301c3a69b2fb7f686d80bbe07187bee52 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 23:09:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 23:09:14 2023 +0000 |
| tree | 3d5b2c1c976dda1dc6086df5b93c67120709aa06 | |
| parent | 2ea35af4e7fd9df83f68384398d21bafeb81bf4d [diff] | |
| parent | 896c255adfa9b0edd7d664fd2f9de897b1e3a1ff [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: 896c255adf -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: I91137de78c53291502ca6dbb880df2cb346034d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>