[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

Browse Source

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

Change-Id: I8ed97b0e1b970c9ec019903563b568dd3a89a0e5

...

This commit is contained in:

TreeHugger Robot

2021-04-27 21:57:23 +00:00

committed by Automerger Merge Worker

parent 3a305bb3b8 ad4df34c13

commit 51589532ef

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