am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2

* commit '2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
  Revert velocity damping. Bug: 4364920