am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2

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