OSDN Git Service

am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into...
authorXia Wang <xiaw@google.com>
Thu, 10 Mar 2011 23:57:27 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Mar 2011 23:57:27 +0000 (15:57 -0800)
commitaf268fff07f15081e072b1685abd3d454739cbf0
tree2e318f83df07f569446359228074dd18e56a17df
parentba0f2a34677e53fa6183a3e0523d6095b522a197
parent416132888bbd1d6c514f88b6f97eed6bd6b3213f
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1

* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
  Add WifiStressTest to Wi-Fi only test suite.