am 70f2f9de: am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev

* commit '70f2f9de8b3e16b06a6f64e35ecb4d7e881b10f9':
  Change Settings name to "Phone"
tree: 4f378178f3127db08c4e4877855fea46e60dd30e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags