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

* commit '1c86f0da95f270c66e6356fc4d4bca1ef2c5fe08':
  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