Merge \\"Remove \\"starting apps\\" boot message.\\" into nyc-mr1-dev am: bb2d9ab98e

author Jeff Sharkey <jsharkey@android.com>

Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)

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

Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)
author Jeff Sharkey <jsharkey@android.com>
Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/java/com/android/server/SystemServer.java
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 7 Jul 2016 19:56:13 +0000 (19:56 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/SystemServer.java	patch \|	diff1 \|	diff2 \|	blob \| history