Merge "Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5 am: 52df5e2c1b"

This commit is contained in:
Android Build Merger (Role)
2016-11-04 19:09:38 +00:00
committed by Android (Google) Code Review

Diff Content Not Available