tree bc47272d97c65e39f9374dc6647d172353844c3d
parent 6cbcea18fdeb0e16c181002f4af8208a87b0e442
parent 05607699171bd220d050897d2b8e956d6fc79258
author Brian Muramatsu <btmura@google.com> 1340827098 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340827098 -0700

am 05607699: Merge "Fix WifiInfoTest flakiness" into jb-dev

* commit '05607699171bd220d050897d2b8e956d6fc79258':
  Fix WifiInfoTest flakiness