am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2

* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
  Stability fixes for PreferenceFragments.