am 22662ef2: Merge change 1706 into donut

Merge commit '22662ef236cc99f0c19f450d9209da961c4868da'

* commit '22662ef236cc99f0c19f450d9209da961c4868da':
  Change cts tests to use InstrumentationTestRunner.
diff --git a/tests/cts/net/AndroidManifest.xml b/tests/cts/net/AndroidManifest.xml
index a1f632e..6c2dfbd 100644
--- a/tests/cts/net/AndroidManifest.xml
+++ b/tests/cts/net/AndroidManifest.xml
@@ -22,7 +22,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.test.InstrumentationCtsTestRunner"
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
                      android:targetPackage="com.android.cts.stub"
                      android:label="CTS tests of android.net"/>