From dc49680d28bffdba2168671e967e8a11988960ba Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 09:27:30 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml
index 1c30338..69f9a53 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml
@@ -16,7 +16,7 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.widget.ContentFrameLayout
+    <android.support.v7.internal.widget.ContentFrameLayout
             android:id="@id/action_bar_activity_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -24,3 +24,4 @@
             android:foreground="?android:attr/windowContentOverlay" />
 
 </merge>
+<!-- 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/layout/abc_screen_content_include.xml -->
\ No newline at end of file

--
Gitblit v1.8.0