Skip to content
Commit 48cb3da7 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 qt-dev am: e086a17e am: 67352cf0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9ff2e866bcd3f281e99bbf63fb557088dfe1f35a
parents 05bc9eb6 67352cf0
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