tree 9db93707145f934ece88c5eb49ac25737af4308c
parent 4f5f092b9a026aa75fa50c6549f71bcbeccf195c
parent 278958e922e4b318193388bc99879a917a2225c8
author Tony Wickham <twickham@google.com> 1470162392 +0000
committer android-build-merger <android-build-merger@google.com> 1470162392 +0000

Merge "Always cancel forwarding on ACTION_UP or ACTION_CANCEL." into ub-launcher3-calgary
am: 278958e922

Change-Id: I16625087195715c1070540a9bdc9e34718225cf9