commit | 742d0908cb44b8d1ff62aaf4138046c6f16f95bc | [log] [tgz] |
---|---|---|
author | Jason Sams <rjsams@android.com> | Thu Oct 22 09:47:00 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 22 09:47:00 2009 -0700 |
tree | 3d9808d1e64cf0c87bb44150a7ac7ba7cf6e7e69 | |
parent | 13742c525e52475cfdd60ec46c6ddab3b1fd5b2e [diff] | |
parent | 8a480fbe5011a5fcc2e73d3b1abfbdd44a5bcbd9 [diff] |
am 8a480fbe: am 5f68de7a: am 2e19c058: Return friction table, tweak values for line rather than pages. Merge commit '8a480fbe5011a5fcc2e73d3b1abfbdd44a5bcbd9' * commit '8a480fbe5011a5fcc2e73d3b1abfbdd44a5bcbd9': Return friction table, tweak values for line rather than pages.