am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003

* commit '7010d0b6c398cb03b4be43a547921c3e9a95eeb0':
  Check bounds on CharSequence drawText methods