am 5a1b76b8: am 721aea44: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread

* commit '5a1b76b822420df5baf69701f1da1bfecc16cae0':
  Fix WifiInfoTest