commit 6eb7128c9cadab4f823fc21f917b4bf81efe3b6e
author Brian Muramatsu <btmura@google.com> Fri Oct 07 11:14:08 2011 -0700
committer Brian Muramatsu <btmura@google.com> Fri Oct 07 11:14:08 2011 -0700
tree 458970f0c1286dacfc03c750681be77a702aa058
parent b8ddbd082adb24e44217d255377ef8618d242db1
parent 8670b1c23f1c074ce430213efc69f573410eabd3

Merge remote branch 'goog/gingerbread' into honeycomb

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/app/src/android/app/cts/DownloadManagerTest.java

Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 96a935b..3751b3c 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -48,13 +48,14 @@
     public static final int TYPE_MOBILE = ConnectivityManager.TYPE_MOBILE;
     public static final int TYPE_WIFI = ConnectivityManager.TYPE_WIFI;
     private static final int HOST_ADDRESS = 0x7f000001;// represent ip 127.0.0.1
-    private ConnectivityManager mCm;
-    private WifiManager mWifiManager;
-    private PackageManager mPackageManager;
 
     // device could have only one interface: data, wifi.
     private static final int MIN_NUM_NETWORK_TYPES = 1;
 
+    private ConnectivityManager mCm;
+    private WifiManager mWifiManager;
+    private PackageManager mPackageManager;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();