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

Merge "Merge "Don't check device_provisioned on Wear devices in... 

Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf am: ddec36e3" into nyc-mr2-dev-plus-aosp
am: c296020f

Change-Id: I98f4fac8b063ebec21271e5b46ff3027305c1165
parents edfc9370 c296020f
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