Merge "Change Settings name to "Phone"" into mnc-dev
tree: 60fd628602d927e64911bea6178cfe8892bae3bd
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags