am 30cc9b91: am bd7c7736: am 597e4df3: am 70f2f9de: am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev

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