From 4b83e449973eff3303ba813806c1edfafd323347 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 15:20:06 +0800
Subject: [PATCH] 

---
 VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt b/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..a5b114f
--- /dev/null
+++ b/VisitFace/RtspNativeCodec/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,53 @@
+-- Merging decision tree log ---
+manifest
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:1-23:12
+	package
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:3:11-44
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+	xmlns:android
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:2:11-69
+uses-feature#0x00020000
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:3-52
+	android:glEsVersion
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:5:17-49
+uses-permission#android.permission.INTERNET
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:3-81
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:8:20-62
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:3-79
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:9:20-76
+application
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:11:3-22:17
+	android:label
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:14:7-39
+	android:allowBackup
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:12:7-34
+	android:icon
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:13:7-41
+activity#com.example.nativecodec.NativeCodec
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:5-21:16
+	android:label
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:16:15-47
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:15:15-42
+intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:17:7-20:23
+action#android.intent.action.MAIN
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:9-61
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:18:17-58
+category#android.intent.category.LAUNCHER
+ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:19:9-69
+	android:name
+		ADDED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml:19:19-66
+uses-sdk
+INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+	android:targetSdkVersion
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml
+		INJECTED from D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\AndroidManifest.xml

--
Gitblit v1.8.0