am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2

* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.