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

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable/abc_dialog_material_background_light.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable/abc_dialog_material_background_light.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable/abc_dialog_material_background_light.xml
new file mode 100644
index 0000000..d7e76b2
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/drawable/abc_dialog_material_background_light.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="16dp"
+       android:insetTop="16dp"
+       android:insetRight="16dp"
+       android:insetBottom="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/background_floating_material_light" />
+    </shape>
+</inset><!-- 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/abc_dialog_material_background_light.xml -->
\ No newline at end of file

--
Gitblit v1.8.0