OSDN Git Service

Merge "Revert to jb-mr2 handling of app died." into klp-dev
authorCraig Mautner <cmautner@google.com>
Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
commitade5f387fa3e1c7d0de16a3d80fb8e3d5105a39b
tree74b1fc2bf31d1bdbee547b7898182f60769e223e
parenteb09f9903807208d651a6cae38b9c9bc03984556
parent1909125ebab026fff1836a93b9b14ea62f404d22
Merge "Revert to jb-mr2 handling of app died." into klp-dev
services/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/am/ActivityStack.java
services/java/com/android/server/am/ActivityStackSupervisor.java