tree 853cab3ade746c1054c9bab915198d68b5d6beea
parent 1784d579f46fb10a7b805bfaa90b4ab65a1f0d33
parent 70a421e2243fd0e89b694e888adf0a628a30c42d
author Hyunyoung Song <hyunyoungs@google.com> 1475278173 +0000
committer android-build-merger <android-build-merger@google.com> 1475278173 +0000

Merge "Consume ACTION_UP when fling is detected on top of icon" into ub-launcher3-calgary-polish
am: 70a421e224

Change-Id: I137233073999cf59871545c54b63f8bd889fdf8e