From: Doris Liu Date: Tue, 8 Apr 2014 20:04:42 +0000 (+0000) Subject: Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state... X-Git-Tag: android-x86-6.0-r3~1064^2~22 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39262608;p=android-x86%2Fpackages-apps-Camera2.git Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali --- 3926260864a25a7db00e5a7d629b363cc833ffb3