am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread
am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread

Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'

* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
  Minor SharedPreference clean-up.

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