am 4d3baaf5: Merge "Bug fixes in Text selection." into gingerbread

Merge commit '4d3baaf5308ddee43c1cd742497a38806cec6320' into gingerbread-plus-aosp

* commit '4d3baaf5308ddee43c1cd742497a38806cec6320':
  Bug fixes in Text selection.