Merge "Make ContactPreferences use SharedPreferences instead of System settings (5/5)" into lmp-dev
tree: adeffa3f76467b51a8ec3040327245910e14c2b8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags