From 1eb1ffa329352dbbd4c5d6cf3e1ef08272e31957 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 13:40:59 +0800
Subject: [PATCH] 缩放和中文字体稳定版，NV12转RGB565功能正常

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v22/values-v22.xml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v22/values-v22.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v22/values-v22.xml
index d4a514a..2b07470 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v22/values-v22.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/values-v22/values-v22.xml
@@ -4,12 +4,8 @@
     <style name="Base.Theme.AppCompat.Light" parent="Base.V22.Theme.AppCompat.Light"/>
     <style name="Base.V22.Theme.AppCompat" parent="Base.V21.Theme.AppCompat">
         <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item>
-        <!-- We use the framework provided edit text background on 22+ -->
-        <item name="editTextBackground">?android:attr/editTextBackground</item>
     </style>
     <style name="Base.V22.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light">
         <item name="actionModeShareDrawable">?android:attr/actionModeShareDrawable</item>
-        <!-- We use the framework provided edit text background on 22+ -->
-        <item name="editTextBackground">?android:attr/editTextBackground</item>
     </style>
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0