tree 3d9808d1e64cf0c87bb44150a7ac7ba7cf6e7e69
parent 2a90c6ec2f217f87d1e807a19edb1a4895fa10c9
parent 5f68de7a6783535aad877a33c090e0b0ce8e0791
author Jason Sams <rjsams@android.com> 1256229334 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256229334 -0700

am 5f68de7a: am 2e19c058: Return friction table, tweak values for line rather than pages.

Merge commit '5f68de7a6783535aad877a33c090e0b0ce8e0791' into eclair-mr2-plus-aosp

* commit '5f68de7a6783535aad877a33c090e0b0ce8e0791':
  Return friction table, tweak values for line rather than pages.