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

Browse Source

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

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

...

This commit is contained in:

Vladimir Komsiyski

2023-06-27 14:39:01 +00:00

committed by Automerger Merge Worker

parent cf8ecf737d 919e3ef9fb

commit b545a40612

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