| commit | 52df5e2c1bb88d66cf350d1d6e93ab87c9afd023 | [log] [tgz] |
|---|---|---|
| author | Greg Plesur <plesur@google.com> | Fri Nov 04 15:57:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 04 15:57:57 2016 +0000 |
| tree | 599cf82dc31e07cdd1a93259c9d78ee90924511d | |
| parent | c874e600029d87c41c797946191f5ae7b4835794 [diff] | |
| parent | d4ef6421e553ec81e41639af5c4a109412be98e0 [diff] |
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5 Change-Id: I6b1b41e844c72573dd7c5de51b6e9a63b590b632