tree cc7d5eaaff5d3dbb0b1dd3a45ce6aeb2fb6e5b1e
parent b7dfeedb56eee69b5dd9c93d58b207077b943982
parent 886afd25c9987a5a660593dfe3ea24e2aa908a5f
author Adam Powell <adamp@google.com> 1307488952 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307488952 -0700

am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2

* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector