Jeff Brown 681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp
* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.
2012-06-12 12:41:11 -07:00
..
2012-06-06 17:05:37 -07:00