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

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2023-06-27 13:49:20 +00:00

committed by Automerger Merge Worker

parent 919e3ef9fb 8412f1cd7e

commit 35ce513378

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