am fbbd7a8c: am 76fc1b9b: (-s ours) am fb9c5391: Merge "Change Settings name to "Phone"" into mnc-dev

* commit 'fbbd7a8ca83ae673e41cbe2ca3c094a92f964bdc':
tree: 84230245b6d0620425180d5fab12ff558de999ab
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags