OSDN Git Service

resolved conflicts for merge of b7bba718 to master
authorCraig Mautner <cmautner@google.com>
Thu, 19 Dec 2013 18:55:17 +0000 (10:55 -0800)
committerCraig Mautner <cmautner@google.com>
Thu, 19 Dec 2013 18:55:17 +0000 (10:55 -0800)
commitff288f7f57dfd7f12a6e8c36d9d46331077dbc03
tree0a7bb2027da086281f8be712c99dc170b51410b2
parented6649f89f236ea9e665028bd33d6d804b906a92
parentb7bba718a88e9baa843e51d9871129d8e682c0b0
resolved conflicts for merge of b7bba718 to master

Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
Android.mk
services/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/am/ActivityRecord.java
services/java/com/android/server/am/ActivityStack.java
services/java/com/android/server/am/ActivityStackSupervisor.java
services/java/com/android/server/wm/WindowManagerService.java