OSDN Git Service

Merge "Use calling user ID when calling isDeviceLocked" into oc-dev
authorSiyamed Sinir <siyamed@google.com>
Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 31 Oct 2017 16:16:16 +0000 (16:16 +0000)

Trivial merge