Skip to content
Commit 0e39f18e authored by Greg Plesur's avatar Greg Plesur Committed by android-build-merger
Browse files

Merge "Merge "Allow any device with a device_owner to execute... 

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

Change-Id: Ia2ff41983c4b04f11e22c95fd4659bdd0521a1f6
parents d8ede890 1f26fadb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment