OSDN Git Service

Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
authorJorim Jaggi <jjaggi@google.com>
Fri, 11 Mar 2016 12:02:36 +0000 (12:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Mar 2016 12:02:38 +0000 (12:02 +0000)
commit95b69f82316220bc40d227bf7208920eb6ed9283
tree278bf8f19e068290315c592fb8deba626b1e0929
parent13d66d8456ec4661a9eda5f26e72b1d9188bfbe6
parentd47e7e1176dcf6961c7c9fce215f48f03a5098d1
Merge "Add ability to swap docked/fullscreen stack" into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/wm/WindowManagerService.java