tree 83782c70e05463d7dde8924ea545e9c503398211
parent 76ad002c32e8075d2df29063ead951bc0e820fb1
parent b7edd04f7adc8ed8c0c22a3c6601c22d355fc4da
author Jeff Brown <jeffbrown@android.com> 1307494350 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307494350 -0700

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

* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920