Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp * commit '59993d9bc589089e6be55371c6536a42afe21a64': Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp * commit '59993d9bc589089e6be55371c6536a42afe21a64': Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX