commit | d4ef6421e553ec81e41639af5c4a109412be98e0 | [log] [tgz] |
---|---|---|
author | Greg Plesur <plesur@google.com> | Fri Nov 04 14:09:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 04 14:09:33 2016 +0000 |
tree | b08dea944305d2e65bc8eab8cdfa2b5b0823661d | |
parent | 9ee91d8d11416e102c12859ffbe1d35fc9eedc55 [diff] | |
parent | e50a485c22334fd5b63663200a8e39f7e2b5b108 [diff] |
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0