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:55:04 +0000 (16:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 16:55:04 +0000 (16:55 +0000)
am: 5878e9c46b

Change-Id: Id2e10f670cf6687fe62dbe67bb7615b9121743f4


Trivial merge