[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: c255fadec8 am: 0976919ceb am: 5068809180

Browse Source

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

Change-Id: Ibdac2c060d8465ea8be99cfb5812cfaf64933924
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:38:26 +00:00

committed by Automerger Merge Worker

parent 77e15a507d 5068809180

commit cf8ecf737d

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