tree 89ded3643fc1d944658f88a967b1e5a1058d221a
parent 27cdd1cdf99f1a90f8712647ab8321676f4bd678
parent b78af3a57a966eec0e3c41983a1a72216f10f0d8
author Allen Hair <allenhair@google.com> 1383948346 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383948346 -0800

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

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