| commit | 5729d92a8556a4b6fea54480a789a317990b9a33 | [log] [tgz] |
|---|---|---|
| author | Greg Plesur <plesur@google.com> | Fri Nov 04 19:08:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 04 19:08:58 2016 +0000 |
| tree | 5548ad24b4d1eca3678a6eb3844ac15f966be029 | |
| parent | 9b3e882c1d110098b3a00e90fb08d42d887c9bab [diff] | |
| parent | 52df5e2c1bb88d66cf350d1d6e93ab87c9afd023 [diff] |
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