[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: 77fa67e424 am: 190696b91c

Browse Source

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23827751

Change-Id: I5968b53b9d019837f876e8f712c4c2cd18c3402f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Vladimir Komsiyski

2023-06-27 13:48:45 +00:00

committed by Automerger Merge Worker

parent 5068809180 190696b91c

commit 919e3ef9fb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available