From bd17d8c63b310faf975c5f0be7efa0451f07ae46 Mon Sep 17 00:00:00 2001
From: Andrii Kulian <akulian@google.com>
Date: Wed, 18 May 2016 19:37:03 -0700
Subject: [PATCH] Fix build breakage caused by redefining attrs

minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
---
 core/res/res/values/attrs_manifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 97b04e2380dd6..6c4340ad2349c 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -2281,7 +2281,7 @@
          activities launched in the task. That is if the root activity of a task set minimal width,
          then the system will set the same minimal width on all other activities in the task. It
          will also ignore any other minimal width attributes of non-root activities. -->
-        <attr name="minWidth" format="dimension" />
+        <attr name="minWidth" />
         <!-- @removed -->
         <attr name="minimalWidth" format="dimension" />
         <!-- Minimal height of the activity.
@@ -2290,7 +2290,7 @@
          activities launched in the task. That is if the root activity of a task set minimal height,
          then the system will set the same minimal height on all other activities in the task. It
          will also ignore any other minimal height attributes of non-root activities. -->
-        <attr name="minHeight" format="dimension" />
+        <attr name="minHeight" />
         <!-- @removed -->
         <attr name="minimalHeight" format="dimension" />
     </declare-styleable>