tree 4002d2a00b33089c926d4f693be7e4138052184a
parent 5df3b71216dee0dc35bb8595901b512dd94590a5
parent 938125dac34620f6e1943b4ea00b56b3cc96ebda
author Adam Powell <adamp@google.com> 1299890649 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299890649 -0800

am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1

* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances