[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13 am: b474d2cb17 am: c9534f61b5 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I44007722d81abe54262dc4ca4ee25110e8418796

...

This commit is contained in:

TreeHugger Robot

2021-04-27 22:35:32 +00:00

committed by Automerger Merge Worker

parent 5aa65e4e29 c9534f61b5

commit 79677ee469

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