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

* commit '8a440477fd203d74b73b32dc2b357f07dfc36067':
  Clean-up in TextView