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

Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in... 

Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3e am: b4bb7d17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56e12a0ec1c6ea6930690b0c0b387ec5553a79c4
parents daa97df4 b4bb7d17
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