am 78077455: am f555bf65: Merge change I4a4323c0 into eclair-mr2
am 78077455: am f555bf65: Merge change I4a4323c0 into eclair-mr2

Merge commit '78077455a89de6485f6d2223648e241ad7240ff6'

* commit '78077455a89de6485f6d2223648e241ad7240ff6':
  Fixes scroll/measure bug in EditText

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base