tree 4f31786c9dc65b56d8094e9868577f7a5efbfda2
parent 05913cc97915f04d0c75ce6a39282628570e90ff
parent c36303a66d1cb72f7216dc90ee7239b2b77a9815
author Victoria Lease <violets@android.com> 1361297499 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361297499 -0800

am c36303a6: Merge "Applying ChannelScrolling to remove calculateDragAngle"

* commit 'c36303a66d1cb72f7216dc90ee7239b2b77a9815':
  Applying ChannelScrolling to remove calculateDragAngle