am 360fde8e: am 446aeb1c: Merge change Ia98129b9 into eclair-mr2

Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107'

* commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107':
  Fix preference caching to increase recycling of preference views.