am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in...
am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
* commit 'b4693e25':
Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.