am b67f24eb: Merge "Clarify phone type magic constant naming." into mnc-dev

* commit 'b67f24eb6229ea10afb83f8ef2bf2bc6ba29a8f6':
  Clarify phone type magic constant naming.
tree: 3dc373b9f786fedf9edc19c3f992bbf6f217bd8d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags