Merge "Clarify phone type magic constant naming." into mnc-dev
tree: 7c44206502d3a244a3fc37161d111320f632e366
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags