From cf69a29aebf61307ef333d141b403370628f2a60 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:28:05 +0800
Subject: [PATCH] Failed commit: Default

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

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v21/abc_action_bar_item_background_material.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v21/abc_action_bar_item_background_material.xml
index 595c56c..acd1a81 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v21/abc_action_bar_item_background_material.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable-v21/abc_action_bar_item_background_material.xml
@@ -15,4 +15,4 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:attr/colorControlHighlight"/>
\ No newline at end of file
+        android:color="?android:attr/colorControlHighlight"/><!-- 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-v21/abc_action_bar_item_background_material.xml -->
\ No newline at end of file

--
Gitblit v1.8.0