tree 3d9808d1e64cf0c87bb44150a7ac7ba7cf6e7e69
parent 3a4f4823facdf179b1c4831e5a33e3eaa6556fc5
parent 2e19c05891c9c7abd2200b8f9ade875a3ca02aa6
author Jason Sams <rjsams@android.com> 1256219193 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256219193 -0700

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

Merge commit '2e19c05891c9c7abd2200b8f9ade875a3ca02aa6' into eclair-mr2

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