Merge "Revert to jb-mr2 handling of app died." into klp-dev

author Craig Mautner <cmautner@google.com>

Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
author Craig Mautner <cmautner@google.com>
Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
diff --cc services/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc services/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
author	Craig Mautner <cmautner@google.com>
	Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 6 Oct 2013 21:29:05 +0000 (21:29 +0000)
		1	2
services/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/am/ActivityStack.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/am/ActivityStackSupervisor.java	patch \|	diff1 \|	diff2 \|	blob \| history