OSDN Git Service

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a
authorSiyamed Sinir <siyamed@google.com>
Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)
am: c275b77b03

Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679


Trivial merge