am af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev
am af195ca0: Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev

* commit 'af195ca07b7bf7452b140d7dfa226942bd947c47':
  Make ContactPreferences use SharedPreferences instead of System settings (1/5)

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base