OSDN Git Service

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

Change-Id: I9751a0c4dd069908e1d0a1a5d3657c7b5c7c1005