tree c9f94a6eea6b3f00b37d2932cd84d5f2a6b74aea
parent 71713e846c68e6161943c6757c60a794c98e4cad
parent 008e620153836ae4d1014d6e650970825ca281ea
author Matthew Ng <ngmatthew@google.com> 1496965429 +0000
committer android-build-merger <android-build-merger@google.com> 1496965429 +0000

Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: If6a7101ba7055e23562b87195f35f1e068048389