OSDN Git Service

Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into...
authorGreg Plesur <plesur@google.com>
Fri, 4 Nov 2016 14:02:09 +0000 (14:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Nov 2016 14:02:12 +0000 (14:02 +0000)

Trivial merge