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:25:36 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:25:36 +0000 (23:25 +0000)
commitafa235e444143319e554158cd33933ba63635ed6
treeda53df9408ef12777d34cb49241fed148c5cef1c
parent4ec78fa17b5888adf33d9a06a1b1793292241cf2
parent008e620153836ae4d1014d6e650970825ca281ea
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am: 008e620153

Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37
services/core/java/com/android/server/am/ActivityStackSupervisor.java