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.