Commit 0eb85b9d authored Jun 01, 2016 by Android Build Merger (Role) Committed by Android (Google) Code Review Jun 01, 2016

Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am:...

Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650 am: 62eb79e6" into nyc-mr1-dev-plus-aosp

core/res/res/layout/app_error_dialog.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@
		android:id="@+id/aerr_close"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/aerr_close"
		android:text="@string/aerr_close_app"
		android:drawableStart="@drawable/ic_close"
		style="@style/aerr_list_item"
		/>