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

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

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_action_menu_item_layout.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_action_menu_item_layout.xml
index 283358a..cd9e6c8 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_action_menu_item_layout.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/abc_action_menu_item_layout.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<android.support.v7.view.menu.ActionMenuItemView
+<android.support.v7.internal.view.menu.ActionMenuItemView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -28,3 +28,4 @@
         android:textAppearance="?attr/actionMenuTextAppearance"
         android:textColor="?attr/actionMenuTextColor"
         style="?attr/actionButtonStyle"/>
+<!-- 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_action_menu_item_layout.xml -->
\ No newline at end of file

--
Gitblit v1.8.0