am 0d612c0d: am 5602d023: Merge "Scroll edit text into view when keyboard shows." into jb-dev
am 0d612c0d: am 5602d023: Merge "Scroll edit text into view when keyboard shows." into jb-dev

* commit '0d612c0d61f62957f9946b33c78b93b1eb15a06f':
  Scroll edit text into view when keyboard shows.

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