am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2

* commit '6356b17a53fc939c145de26dbc258ef7797ba05c':
  make setup wizard's wifi and datetime settings look good for 7"