am 830fd4af: Merge "Refactor onModifiedTouchEvent into several methods." into gingerbread

Merge commit '830fd4af566cf2545df5f45cd2f53d97c481e254' into gingerbread-plus-aosp

* commit '830fd4af566cf2545df5f45cd2f53d97c481e254':
  Refactor onModifiedTouchEvent into several methods.