am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."
am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."

* commit 'bc2a449a615b30efb81a1a0082a1bb0db515d0f5':
  Fix preference puts with "null" values.

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