From 217b286ad5eb04084ab82e870d90a5d1809b3a28 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 02 八月 2017 11:17:46 +0800
Subject: [PATCH] split client server

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 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
new file mode 100644
index 0000000..69f9a53
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_screen_content_include.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.internal.widget.ContentFrameLayout
+            android:id="@id/action_bar_activity_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:foregroundGravity="fill_horizontal|top"
+            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