commit 9033e74b6ecd5ec05694b0d47ea19c51a6148b78
author Brian Attwell <brianattwell@google.com> Wed May 20 18:46:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 20 18:46:08 2015 +0000
tree b01543463c78184991d7ce752e91cc94a2721f5c
parent d37f863715123769fd1a5eeaa6a6f977f34332af
parent 1e9cc48c94a4d9359c2ea31fab952711b1eb71dc

am 1e9cc48c: am 90a4b4e9: am 0aba6720: Merge "Allow line wrap in "Add new account" buttton" into mnc-dev

* commit '1e9cc48c94a4d9359c2ea31fab952711b1eb71dc':
  Allow line wrap in "Add new account" buttton

res/layout/contact_editor_accounts_changed_activity_with_text.xml

diff --git a/res/layout/contact_editor_accounts_changed_activity_with_text.xml b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
index f608f84..345d937 100644
--- a/res/layout/contact_editor_accounts_changed_activity_with_text.xml
+++ b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
@@ -48,6 +48,7 @@
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
+            android:singleLine="false"
             android:layout_weight="1" />
 
         <Button