| commit | 3926260864a25a7db00e5a7d629b363cc833ffb3 | [log] [tgz] |
|---|---|---|
| author | Doris Liu <tianliu@google.com> | Tue Apr 08 20:04:42 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 08 20:04:42 2014 +0000 |
| tree | 4ebf23f5dd3f70f110ffe0269e9c58ea1759fdbc | |
| parent | f773a11d50fc48f3831f259075a0e64460f9baaa [diff] | |
| parent | 1c5a87b4301c4211d3e3b85be5c863c50d4eab7b [diff] |
Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali