Merge "Fix clipping wrapped Button text" into lmp-mr1-dev
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 33714ea..f608f84 100644
--- a/res/layout/contact_editor_accounts_changed_activity_with_text.xml
+++ b/res/layout/contact_editor_accounts_changed_activity_with_text.xml
@@ -39,6 +39,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:measureWithLargestChild="true"
+        android:baselineAligned="false"
         style="?android:attr/buttonBarStyle">
 
         <Button