am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1

* commit '7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
  Clean-up in TextView