tree 8d8c8b31eb975d7399055448629ec0c0517c7190
parent 33b14f5880ab2ea52876ab46758aa1534351b29f
parent 46dcc9b6229cc0f0f95d46b046b1ee1fe83cca1f
author Adam Powell <adamp@google.com> 1286479400 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286479400 -0700

am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread

Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll