Merge "In ManagedProvisioning, look at canAddMoreManagedProfiles()." into mnc-dev
tree: 24890977930977466081751edfe8fcd7733250d4
  1. comm/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags