OSDN Git Service

Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe
authorJorim Jaggi <jjaggi@google.com>
Thu, 2 Jun 2016 22:22:34 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Jun 2016 22:22:34 +0000 (22:22 +0000)
commit2609c125ed59ed0701b13b6569a5e24c94a972a2
treeee2f28b32a6c4168ed0b12c86555fc4cf88a98d2
parent97ae77e41b84cc5d78c6e15ce7105d871ae8dd11
parenta80c867adf9f2a19cb2d955e9594e5dda4840d26
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe
am: a80c867adf

* commit 'a80c867adf9f2a19cb2d955e9594e5dda4840d26':
  Fix unminimizing dock stack for AppTask.moveToFront

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