Xia Wang 4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 ...

Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0

2011-03-10 15:09:46 -08:00

..

assets

Add Wi-Fi connection test for static IP

2010-12-02 16:25:26 -08:00

res/values

…

src/com/android/connectivitymanagertest

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00

Android.mk

Add Wi-Fi stress tests.

2010-12-07 14:21:51 -08:00

AndroidManifest.xml

Add Wi-Fi stress tests.

2010-12-07 14:21:51 -08:00