Skip to content
Commit ae509461 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: 48cb3da7

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

Change-Id: Iee9500e3317bb6c55813c6d298ba6b251fa808c8
parents 94ea2ea3 48cb3da7
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