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