am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp
am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp

Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.

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