am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev

* commit '5a864aa0d8919d38b23c9e7e90455181d3a979e3':
  ScaleGestureDetector bugfixes

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