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

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