tree 3de16a7998019a89386b5556340e317ff664a7c0
parent 3ebde8a2304296565a870339cd47bfc08b021083
parent 4280891dbc2cf60bdf51726e0aa9265ccb64ec88
author Jean-Baptiste Queru <jbq@google.com> 1329933387 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329933387 -0800

am 4280891d: Merge "The bigger touch slop still has a problem"

* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
  The bigger touch slop still has a problem