From 94e704acde59df60bd42f6f90b94d462d1bfa37c Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期日, 23 七月 2017 12:09:41 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml index 3663b24..0710387 100644 --- a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml +++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="2.2.2$Generated" generated="true"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-idling-resource\2.2.2\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\exposed-instrumentation-api-publish\0.5\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\runner\0.5\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res"/></dataSet><dataSet config="2.2.2$Generated" generated="true"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-core\2.2.2\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="D:\work\DemoForBsk\app\src\androidTest\res"/><source path="D:\work\DemoForBsk\app\build\generated\res\rs\androidTest\debug"/><source path="D:\work\DemoForBsk\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="2.2.2" from-dependency="true" generated-set="2.2.2$Generated"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-idling-resource\2.2.2\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\exposed-instrumentation-api-publish\0.5\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\runner\0.5\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res"><file path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res\values\values.xml" qualifiers=""><string name="app_name">Test-api</string></file></source></dataSet><dataSet config="2.2.2" from-dependency="true" generated-set="2.2.2$Generated"><source path="D:\work\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-core\2.2.2\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\work\DemoForBsk\app\src\androidTest\res"/><source path="D:\work\DemoForBsk\app\build\generated\res\rs\androidTest\debug"/><source path="D:\work\DemoForBsk\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger> \ No newline at end of file +<merger version="3"><dataSet config="2.2.2$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-idling-resource\2.2.2\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\exposed-instrumentation-api-publish\0.5\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\runner\0.5\res"/></dataSet><dataSet config="0.5$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res"/></dataSet><dataSet config="2.2.2$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-core\2.2.2\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\androidTest\res"/><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\generated\res\rs\androidTest\debug"/><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="2.2.2" from-dependency="true" generated-set="2.2.2$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-idling-resource\2.2.2\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\exposed-instrumentation-api-publish\0.5\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\runner\0.5\res"/></dataSet><dataSet config="0.5" from-dependency="true" generated-set="0.5$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res"><file path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test\rules\0.5\res\values\values.xml" qualifiers=""><string name="app_name">Test-api</string></file></source></dataSet><dataSet config="2.2.2" from-dependency="true" generated-set="2.2.2$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\intermediates\exploded-aar\com.android.support.test.espresso\espresso-core\2.2.2\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="F:\workspace2\VisitFace\DemoForBsk\app\src\androidTest\res"/><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\generated\res\rs\androidTest\debug"/><source path="F:\workspace2\VisitFace\DemoForBsk\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger> \ No newline at end of file -- Gitblit v1.8.0