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.