am f555bf65: Merge change I4a4323c0 into eclair-mr2

Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp

* commit 'f555bf65e18407314f569c1c767e5334cf3f56bf':
  Fixes scroll/measure bug in EditText