Skip to content
Commit 94ea2ea3 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT... 

[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded3 am: 5af044fc -s ours am: 05bc9eb6

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

Change-Id: I6d02b3099d03e8e4211325b7be8f303a503cd234
parents 51589532 05bc9eb6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment