am 7e5cd796: (-s ours) am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread

* commit '7e5cd7968356ea111988a372095e352d76476994':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
This commit is contained in:
Brad Fitzpatrick 2010-12-01 09:22:04 -08:00 committed by Android Git Automerger
commit d4c5200442

Diff Content Not Available