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:09:33 +0000 (14:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 14:09:33 +0000 (14:09 +0000)
am: e50a485c22

Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0


Trivial merge