Merge "Fix build breakage caused by redefining attrs" into nyc-dev

         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.

         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>