Merge commit '5910cb53' into eclair-plus-aosp * commit '5910cb53': Edge of screen slop detection for ScaleGestureDetector.