am 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17

automerge: 0be4088

* commit '0be4088ed9253da04f56999e1560ab522d5d9400':
  Remove excess whitespace from the factory reset screen
This commit is contained in:
Sami Tolvanen
2014-10-17 01:38:05 +00:00
committed by android-build-merger

View File

@@ -33,11 +33,13 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textSize="18sp" android:textSize="18sp"
android:text="@string/master_clear_desc" /> android:text="@string/master_clear_desc" />
<TextView android:id="@+id/also_erases_external" <TextView android:id="@+id/also_erases_external"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="false"
android:visibility="gone" android:visibility="gone"
android:textSize="18sp" android:textSize="18sp"
android:text="@string/master_clear_desc_also_erases_external" /> android:text="@string/master_clear_desc_also_erases_external" />