commit | a12b873b1d920c5b3e68aa9d5b6285d7850f9f3e | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 15 21:06:36 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 15 21:06:36 2023 +0000 |
tree | 96216a012f8d9122d040c8008954b8ae58021b91 | |
parent | 887a8ffd3f56f281dfdfd5e805a4b7107231e916 [diff] | |
parent | 2aaea3e4ea3f383a1a77df1dbd40a7335ddf8b80 [diff] |
[automerger skipped] Merge "On device lockdown, always show the keyguard" into sc-v2-dev am: d978682f24 am: 6322292206 am: 2aaea3e4ea -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 c851ef6d27 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090199 Change-Id: Ibda8d2ad9215bb3d6b58290957045396fea1d22b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>