commit edc9d109c233f6a4096a4766684bd3e631bbc00a
author Brian Attwell <brianattwell@google.com> Tue Dec 02 21:04:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 02 21:04:42 2014 +0000
tree 4f365b810c41a84574db095b8951aedd4f2f21c3
parent d151ef7d8a0a0b5e2b3caabebe13d79a557d95a7
parent 75f2c438c25e26edf26a2ca6287ffc27d606196f

am 75f2c438: Merge "Fix clipping wrapped Button text" into lmp-mr1-dev

* commit '75f2c438c25e26edf26a2ca6287ffc27d606196f':
  Fix clipping wrapped Button text

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 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