commit 700539bef58a05be6ef88f5fe2802b2bc5e24787
author Chenbo Feng <fengc@google.com> Tue Jul 18 08:33:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 18 08:33:10 2017 +0000
tree c20d722a140cf87655c039e435e58037a1d6641b
parent ff54e7910cd979f40512496c3656511e6284cf34
parent b67b237853c31ca5262a30e6b3d8e77d7a36a130

Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
am: f33518ff9d

Change-Id: I055c066bcaaa004800db28d401fda54174ac5756

tests/cts/net/native/qtaguid/AndroidTest.xml

diff --git a/tests/cts/net/native/qtaguid/AndroidTest.xml b/tests/cts/net/native/qtaguid/AndroidTest.xml
index 6f4e8f5..2eea82e 100644
--- a/tests/cts/net/native/qtaguid/AndroidTest.xml
+++ b/tests/cts/net/native/qtaguid/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Native Network xt_qtaguid test cases">
+    <option name="config-descriptor:metadata" key="component" value="networking" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsNativeNetTestCases->/data/local/tmp/CtsNativeNetTestCases" />