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

* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
tree: 5a2e56885bf320a464e6b7c4e3f13f68f0f03f59
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE