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