tree 9cd452943841855bf032cbe5aaeae127a9474f3c
parent e389d23ea910f0112539543a06ea359779139f21
parent 84f4980bc26e774622b24730c5f4b1ecd9a1701d
author Daichi Hirono <hirono@google.com> 1555655240 -0700
committer android-build-merger <android-build-merger@google.com> 1555655240 -0700

Merge "Add a flag to cancelDragAndDrop to skip animation" into qt-dev
am: 84f4980bc2

Change-Id: I0659b19c731f44d0479566de5174fb14cbd56b3f