commit 57a22b14e8b05a4823e90836506d616ea2a5ad45
author Sudheer Shanka <sudheersai@google.com> Fri Apr 14 16:31:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 16:31:57 2017 +0000
tree 0b27bc28a0ca3f53a1f09793fb33e261e6d20bde
parent 7e6a4f43098392b192de10121fa118193367f417
parent 26d36057bbd6dbf65e4a42344035852de82ce2a0

Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0  -s ours" into nougat-mr1-cts-dev am: 137a9169cf  -s ours" am: 608a3b8f82  -s ours am: 8884bfc2ac  -s ours" into nyc-mr2-dev-plus-aosp am: c95fb00d30  -s ours" into oc-dev-plus-aosp
am: ccff2be967

Change-Id: I13a46756d87c7adde9672605c299a49c327f1956

tests/cts/net/AndroidTest.xml

diff --git a/tests/cts/net/AndroidTest.xml b/tests/cts/net/AndroidTest.xml
index 389b926..fbad739 100644
--- a/tests/cts/net/AndroidTest.xml
+++ b/tests/cts/net/AndroidTest.xml
@@ -13,7 +13,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Net test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCases.apk" />
         <option name="test-file-name" value="CtsNetTestAppForApi23.apk" />