am 0bab2b06: am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev
am 0bab2b06: am 54562cfb: Merge "Better horizontal internal scroll handling in Text." into jb-dev

* commit '0bab2b068c63508b1f20e182d86f09ab06a88fef':
  Better horizontal internal scroll handling in Text.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base