commit d4f91db879f2c6b2393b4d0a76b27c5ae9594e5a
author Sudheer Shanka <sudheersai@google.com> Fri Apr 14 16:38:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 16:38:54 2017 +0000
tree 0b27bc28a0ca3f53a1f09793fb33e261e6d20bde
parent 6c9d1baba5322c5f169af4ce8b09200e519e6a78
parent f04219bb3a4a363fc7eda33403319cd98b489e75

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: bb6a9be084 am: 89195184af am: 0a0b1d2fe6  -s ours am: 8903a0aa04" into oc-dev-plus-aosp
am: f04219bb3a

Change-Id: Iaf1019e0b9dbfa29d8d773eea53074b74e8a014a

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" />