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 19:08:58 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 19:08:58 +0000 (19:08 +0000)
am: 52df5e2c1b

Change-Id: I228a69981d2e7ec215bdbb31d66c3a4b37e70e56


Trivial merge