am 724561c: Merge change 949 into donut

Merge commit '724561cc20e259888986cbb0be2fdab4d142d869'

* commit '724561cc20e259888986cbb0be2fdab4d142d869':
  Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575). HorizontalScrollView was comparing the measured height of its child to its width.
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java
index 652e30c..02fc7c6 100644
--- a/core/java/android/widget/HorizontalScrollView.java
+++ b/core/java/android/widget/HorizontalScrollView.java
@@ -283,7 +283,7 @@
 
         final View child = getChildAt(0);
         int width = getMeasuredWidth();
-        if (child.getMeasuredHeight() < width) {
+        if (child.getMeasuredWidth() < width) {
             final FrameLayout.LayoutParams lp = (LayoutParams) child.getLayoutParams();
 
             int childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec, mPaddingTop