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:42:29 +0000 (16:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)
am: 1f8536653b

Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d


Trivial merge