Merge "[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: c255fadec8" into udc-d1-dev-plus-aosp am: 8412f1cd7e am: 35ce513378

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

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

committed by Automerger Merge Worker

parent b545a40612 35ce513378

commit 51bb7909c7

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