From ef861375eebd9ac6cce7c0bb163380ab1c951063 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 20 Nov 2015 14:00:11 -0800
Subject: resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
---
 res/layout/permission_description.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'res/layout/permission_description.xml')

diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml
index 3f1cf434..c9b60d64 100644
--- a/res/layout/permission_description.xml
+++ b/res/layout/permission_description.xml
@@ -26,15 +26,14 @@
         android:layout_height="36dip"
         android:layout_marginTop="3dp"
         android:tint="?android:attr/colorAccent"
-        android:scaleType="fitCenter" />
+        android:scaleType="fitCenter" >
+    </ImageView>
 
     <TextView
         android:id="@+id/permission_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/permission_icon"
-        android:lineSpacingMultiplier="1.024"
-        android:fontFamily="@*android:string/font_family_body_2_material"
         android:paddingStart="16dip"
         android:paddingEnd="8dip"
         style="?android:attr/textAppearanceMedium">
-- 
cgit v1.2.3