Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev

am: e50a485c22

Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0
This commit is contained in:
Greg Plesur
2016-11-04 14:09:33 +00:00
committed by android-build-merger

Diff Content Not Available