Skip to content
Commit e6a803cb 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: 7a974a54 am: 2a7d0124 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0286c1e2cc803fc88b73c7f8bdaf536542b8b54
parents f11eee95 2a7d0124
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