tree 6ec1d3fce4f3812319d4db58b30cb08e859720c6
parent 7647091436c45af2d82f12c9ea9ec77fa309b49b
parent c37308f11680f597d09fa783665ba3104d6e6d5c
author Adam Powell <adamp@google.com> 1299890382 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299890382 -0800

Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1