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/uninstall_confirm.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml
index f604023f..78270f60 100644
--- a/res/layout/uninstall_confirm.xml
+++ b/res/layout/uninstall_confirm.xml
@@ -40,9 +40,10 @@
             android:id="@+id/activity_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingStart="16dip"
+            android:paddingEnd="16dip"
             android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            style="@style/padded"
             android:visibility="gone" />
 
         <!-- The snippet (title & icon) about the application being uninstalled. -->
-- 
cgit v1.2.3