Skip to content
Commit d2b2ae91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d4807349 -s ours am: 65f650b6

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

Change-Id: Icefb084d913386d4c131b00464e6a1d5d7903486
parents 61534f62 65f650b6
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