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)
commit5729d92a8556a4b6fea54480a789a317990b9a33
tree5548ad24b4d1eca3678a6eb3844ac15f966be029
parent9b3e882c1d110098b3a00e90fb08d42d887c9bab
parent52df5e2c1bb88d66cf350d1d6e93ab87c9afd023
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5
am: 52df5e2c1b

Change-Id: I228a69981d2e7ec215bdbb31d66c3a4b37e70e56