OSDN Git Service

resolved conflicts for merge of 32360147 to master
authorCraig Mautner <cmautner@google.com>
Tue, 4 Feb 2014 23:55:19 +0000 (15:55 -0800)
committerCraig Mautner <cmautner@google.com>
Tue, 4 Feb 2014 23:55:19 +0000 (15:55 -0800)
commit9e4adfb358ca3680288c07201efc8811472a579d
tree7f4760e22df20ec6dd278c7449d460c7f59f02a2
parent143b46d50c0c01970c7d280228bd1e58c2afb32b
parent323601475e15296bf7bb9a20aa0af130bc561bc2
resolved conflicts for merge of 32360147 to master

Change-Id: I97cc95f66df50006469f8debd286966cc21edb60
api/current.txt
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java
services/core/java/com/android/server/wm/Task.java
services/core/java/com/android/server/wm/WindowManagerService.java