OSDN Git Service

Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev
authorChong Zhang <chz@google.com>
Wed, 2 Mar 2016 18:29:57 +0000 (18:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Mar 2016 18:30:00 +0000 (18:30 +0000)
commit5d9de3ab6f768c9b9d5c4fa627ce019f74370531
tree865b4f70b568ccbb70316802a6af75597ea7b26c
parent27d68bb2df0165149f81fc491d66aa55e33b9a13
parente4fbd328f83ea0ee086731f852cd6c56a3deb733
Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev
core/java/android/app/ActivityManagerNative.java
core/java/android/app/IActivityManager.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java