commit | c11374bc09286c266733d9e8734b5abd6b4cc18b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Oct 05 00:31:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 00:31:42 2023 +0000 |
tree | 20e46bbcc80d62d575cb84db84bd7fc9dc0852cf | |
parent | b4ec94e8ed731bcf5e9fd5b31d3f52b485fad183 [diff] | |
parent | ac115aa9299cf58610c944ac3321d87a6e5d4ccd [diff] |
[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours am: fa1bc4a7ef -s ours am: 81c628fcbd -s ours am: ac115aa929 -s ours am skip reason: skipped by user beverlyt Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24805388 Change-Id: I9641878285b6612622a30a508eb4b423f1d46ec5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>