tree d48dcb616a27a6f3b1cb2baecc23c18aecd72c38
parent 77e4fa895e30edfabfdfc3a2db9bba642c3cb7b8
parent 325af20235e346f3db279fc5ff6f491998b297ee
author Mahaver Chopra <mahaver@google.com> 1468317660 +0000
committer android-build-merger <android-build-merger@google.com> 1468317660 +0000

Merge \\"Add an api to verify if ro.device_owner was set\\" into nyc-mr1-dev am: c1182a8128
am: 325af20235

Change-Id: I18fc9c4d7662c6b05e3b66d9a1fcddb9c9e43730