tree 14f97ba441e1ba7adce8f791c223bede12af8d8c
parent d8eab09d173d04db554ad0078eb5e20f163fe19e
parent 5a1b76b822420df5baf69701f1da1bfecc16cae0
author Brian Muramatsu <btmura@android.com> 1302568372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302568372 -0700

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

* commit '5a1b76b822420df5baf69701f1da1bfecc16cae0':
  Fix WifiInfoTest