Merge "Add carrierconfigs to treat mdn as VM number" into nyc-mr2-dev
am: e3eaf0ed4e  -s ours

Change-Id: Ia0185ac3fea6f5e5e631dcb7691a04ea27832bcc
tree: 2707bc4b830166c1cb98a2f761b08c10d04ef04a
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags