diff options
| author | 2023-10-02 22:09:11 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:09:11 +0000 | |
| commit | e00bac3a2ed245c32f2be45e99e6579aeea24e10 (patch) | |
| tree | 0197dbf06a9533f2900b62e545a8e75cb4a4adf9 | |
| parent | d7f94d248efb8ee0dbdbacdaf948862cfdb9d019 (diff) | |
| parent | 627877e43157a7b91d37870c1dd40c90012247ba (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours am: 3815edc6e2 -s ours am: 3307ef05ee -s ours am: 742411fe53 -s ours am: 627877e431 -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286
Change-Id: Id77b4de6e6b6a2eb8bc61b1b9b28aeb5321d2ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions