Clean up when recycling a pid with a pending launch am: d86e14e45c am: 92de60bd7f

author Amith Yamasani <yamasani@google.com>

Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)
author Amith Yamasani <yamasani@google.com>
Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/am/BroadcastQueue.java
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 11 Aug 2016 22:02:53 +0000 (22:02 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/BroadcastQueue.java	patch \|	diff1 \|	diff2 \|	blob \| history