am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2

* commit '1e43e694ae0822426d4759aa2d5192cbe5d15d63':
  Fix cryptkeeper UI for 7" tablets.