OSDN Git Service

Merge "Fixes the animation and state when docking a task by drag" into oc-dev
authorMatthew Ng <ngmatthew@google.com>
Thu, 8 Jun 2017 23:31:02 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:31:02 +0000 (23:31 +0000)
am: 008e620153

Change-Id: If1947aac627b92213202b22b721a397492173508


Trivial merge