Merge "Fix "num" in the carrier config to be 5 vs 4." into nyc-mr1-dev
tree: 4ecee4e006308dc868e794ab3718dc3e635e783a
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags