am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread

Merge commit '6799864d6c9744e4c5133a90410576b577d65de6'

* commit '6799864d6c9744e4c5133a90410576b577d65de6':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX