From d91e2673d7b291e1798e1acee506749eae3cdd01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 10 Mar 2014 18:23:47 +0100
Subject: Revert "Lint changes"

This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
---
 .../src/main/res/layout/actionbar_include_cancel_button.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml')

diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
index 04f41d38c..5fd36286b 100644
--- a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml
@@ -14,7 +14,7 @@
       limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/actionbar_cancel"
     style="@style/Widget.AppCompat.ActionButton"
     android:layout_width="0dp"
@@ -33,4 +33,4 @@
         style="@style/Widget.AppCompat.Light.ActionBar.TabText"
         android:text="Cancel (set in-code!)" />
 
-</merge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3