Merge \\\"Do not schedule restarts if the system is shutting down\\\" into nyc-dev...

author Fyodor Kupolov <fkupolov@google.com>

Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)

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

Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)
author Fyodor Kupolov <fkupolov@google.com>
Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
author	Fyodor Kupolov <fkupolov@google.com>
	Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 17 Jun 2016 21:35:12 +0000 (21:35 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityRecord.java	patch \|	diff1 \|	diff2 \|	blob \| history