OSDN Git Service

am 39262608: Merge "Cancel touch event forwarding when transitioning from shimmy...
authorDoris Liu <tianliu@google.com>
Tue, 8 Apr 2014 20:08:45 +0000 (20:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Apr 2014 20:08:45 +0000 (20:08 +0000)
commit1f8951e9fa956e1d1e9283141a11b8b1c2f1f9dd
tree702827f4d5348aa2a99a6e8fc76cc2f5691ead5b
parentc29db9f8ca2f6c8db2d30e0a90e0a145512f2fb6
parent3926260864a25a7db00e5a7d629b363cc833ffb3
am 39262608: Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali

* commit '3926260864a25a7db00e5a7d629b363cc833ffb3':
  Cancel touch event forwarding when transitioning from shimmy to scroll state