Merge "MP: Introduced new NFC provisioning mime-type application/com.android.managedprovisioning.v2"
tree: 1abe5dad5e96ea07e2b821e2434203fb851a7be3
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml