Merge commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe' into eclair-plus-aosp * commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe': TransformGestureDetector is now ScaleGestureDetector - scope reduced.