Merge "fix "am start -W" hang on activity start" into nyc-dev am: 5e40748

author Chong Zhang <chz@google.com>

Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)

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

Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)
author Chong Zhang <chz@google.com>
Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)
diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
diff --cc services/core/java/com/android/server/am/TaskRecord.java
Simple merge
author	Chong Zhang <chz@google.com>
	Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 25 Apr 2016 17:26:54 +0000 (17:26 +0000)
		1	2
services/core/java/com/android/server/am/ActivityRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/TaskRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history