am ff46a5c9: am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread

Merge commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969'

* commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969':
  Fixed single line state on TextView.