Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp * commit 'f555bf65e18407314f569c1c767e5334cf3f56bf': Fixes scroll/measure bug in EditText
Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp * commit 'f555bf65e18407314f569c1c767e5334cf3f56bf': Fixes scroll/measure bug in EditText