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)
commit5878e9c46bf3b9b40a7b258a537cab1e0957a21c
treec95bee0eb2fc9774c432819d82d326dff3c76d35
parentf8fb25ca040327dedc45d97cbfb4cf4da4f0fe1b
parent88f92e101d35fabcb8bd06abef96e467f3f18b72
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572
am: 88f92e101d

Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815