From 3a5f09c61a87adb8dba2cc4a5366893886ba1c1d Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 17:31:40 +0800
Subject: [PATCH] 接口初步完成

---
 VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..0710387
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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