tree 4eb70d29bd478f9e2273acded3f7ba66c2c9703a
parent a55677651f78801a7b608ee8f7886104f453801d
parent d5c031c75bbdd0ed75d6acde88919e9262ff086a
author Android Build Merger (Role) <android-build-merger@google.com> 1486670297 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486670303 +0000

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