tree d600bc1ac3c3eda3f0f42db3e4c4e10c958f7c93
parent 0481170a8553cc46484d6026eb4faf346a63925c
parent f8c7d06ffa67015516b822a992513ab86aad1ad5
author Grace Kloba <klobag@google.com> 1264471862 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264471862 -0800

am f8c7d06f: am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair

Merge commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5'

* commit 'f8c7d06ffa67015516b822a992513ab86aad1ad5':
  Fix the sloppy detection in the ScaleGestureDetector.