LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: f33518ff9d

Change-Id: I055c066bcaaa004800db28d401fda54174ac5756
This commit is contained in:
Chenbo Feng
2017-07-18 08:33:10 +00:00
committed by android-build-merger
parent ff54e7910c b67b237853
commit 700539bef5
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cts/net/native/qtaguid/AndroidTest.xml
View File

@@ -14,6 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<configuration description="Config for CTS Native Network xt_qtaguid test cases"> <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"> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" /> <option name="cleanup" value="true" />
<option name="push" value="CtsNativeNetTestCases->/data/local/tmp/CtsNativeNetTestCases" /> <option name="push" value="CtsNativeNetTestCases->/data/local/tmp/CtsNativeNetTestCases" />