Merge change I4a4323c0 into eclair-mr2 (f555bf65) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5198,7 +5198,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mDesiredHeightAtMeasure = desired;

		if (heightMode == MeasureSpec.AT_MOST) {
		height = Math.min(desired, height);
		height = Math.min(desired, heightSize);
		}
		}