diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-06-12 12:41:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 12:41:11 -0700 |
| commit | 681f745916e4809f46e0d742437f7d724fc5be35 (patch) | |
| tree | 96efa428f142b747d9951b3aa796c374f3aba66c /docs/html/sdk/api_diff/5/changes | |
| parent | 42da1f401b114c101df6f0a048068f0f594215cd (diff) | |
| parent | 7d9a18eeb684e87da5a907c96d25da21918119b5 (diff) | |
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.
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions