commit | 0b5a34c25795ddd49f80f321a02414cc7d8d4ef9 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Oct 04 22:17:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 04 22:17:31 2023 +0000 |
tree | 1744f9efd0c1b570267dec513b6bb3a8299470e3 | |
parent | 2160024dae7db12f837145ee77842c69d8b62166 [diff] | |
parent | 9b4ab43d7bface1b04058a20f455c16b066d774e [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 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: I77b8dbb46ec14bdf49d1fbcf9f0fc5def69974aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>