OSDN Git Service

Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572
authorSiyamed Sinir <siyamed@google.com>
Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 16:42:48 +0000 (16:42 +0000)
am: 88f92e101d

Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815


Trivial merge