tree 5f7686c4a5938742d4ff151c3d0f153db0288d3a
parent ce3e41f7916286e9f81a93e4f1097719b4d239e2
parent 7f40766c257463bcbdfe8fd01eb190cfe7f5abee
author Matthew Ng <ngmatthew@google.com> 1496966076 +0000
committer android-build-merger <android-build-merger@google.com> 1496966076 +0000

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

Change-Id: I584a49cf8724ca6946cc7a8db24d9a75eac5e660