From 9a3ef17d8b9f96fa05b5439c89bbfc2868d0f268 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 14:53:00 +0800
Subject: [PATCH] optimize

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

diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..9d45eb5
--- /dev/null
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\androidTest\res"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\androidTest\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\androidTest\res"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\rs\androidTest\debug"/><source path="D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
\ No newline at end of file

--
Gitblit v1.8.0