[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 94ea2ea32a -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Id64d19b0534191333ca4c2172efd4b4d60f32da5

...

This commit is contained in:

Jonathan Scott

2021-04-27 22:15:23 +00:00

committed by Automerger Merge Worker

parent c8e009af4c 94ea2ea32a

commit 112d4342dd

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