am eb189d39: Merge "Performance improvement in TextView" into ics-mr1

* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
  Performance improvement in TextView