Merge remote branch 'goog/gingerbread' into honeycomb
Conflicts:
apps/CtsVerifier/AndroidManifest.xml
tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
tools/host/src/com/android/cts/Version.java
Change-Id: Ie15a3eb7f002a300469f17e3f906856c07061223
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 77191cb..5877812 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();