tree 0a89cdcd5fc9698b68255ffcb9c1a4a785772903
parent 71709a84b368282107b843ad1cd8cfcb965df8fa
parent 751b0feb76f1a53ea7e93ec2a3558543f378d371
author Allen Hair <allenhair@google.com> 1383949538 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383949538 -0800

am 751b0feb: am 0ec4676a: am b78af3a5: Merge "Fixed testPinchIn to calculate expected touch down points correctly." into klp-dev

* commit '751b0feb76f1a53ea7e93ec2a3558543f378d371':
  Fixed testPinchIn to calculate expected touch down points correctly.