tree 718c5ebd7b65bfa850957a24a730bec48d6df9cb
parent 92ab94849ff05a70d1d5ae71480d193aafe13037
parent a55677651f78801a7b608ee8f7886104f453801d
author Greg Plesur <plesur@google.com> 1486670906 +0000
committer android-build-merger <android-build-merger@google.com> 1486670906 +0000

Merge "Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev am: 5659b15a94 am: 89085b1593" into nyc-mr2-dev-plus-aosp
am: a55677651f

Change-Id: I5f26af7cedfeab861acae935af965392ef3ac810