| commit | 1f8951e9fa956e1d1e9283141a11b8b1c2f1f9dd | [log] [tgz] |
|---|---|---|
| author | Doris Liu <tianliu@google.com> | Tue Apr 08 20:08:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 08 20:08:45 2014 +0000 |
| tree | 702827f4d5348aa2a99a6e8fc76cc2f5691ead5b | |
| parent | c29db9f8ca2f6c8db2d30e0a90e0a145512f2fb6 [diff] | |
| parent | 3926260864a25a7db00e5a7d629b363cc833ffb3 [diff] |
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