am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread

Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp

* commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
  Avoid unnecessary SharedPrefences disk writes.