From 96d786678e1909c1f7d77a6f1d586d02a9881f6a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 15:27:56 +0800
Subject: [PATCH] rtps server (not ok)

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v23/abc_control_background_material.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v23/abc_control_background_material.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v23/abc_control_background_material.xml
index 0b54039..c1e626f 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v23/abc_control_background_material.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v23/abc_control_background_material.xml
@@ -16,4 +16,4 @@
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         android:color="@color/abc_color_highlight_material"
-        android:radius="20dp" />
\ No newline at end of file
+        android:radius="20dp" /><!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml -->
\ No newline at end of file

--
Gitblit v1.8.0