Commits
Jeff Brown authored and Android Git Automerger committed 681f745916eM
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.
Showing diff to7d9a18eeb68