am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair

Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp

* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
  Edge of screen slop detection for ScaleGestureDetector.