Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)

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

Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)
diff --cc core/java/android/app/IActivityManager.aidl
Simple merge
diff --cc core/java/android/app/ProfilerInfo.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerShellCommand.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)
		1	2
core/java/android/app/IActivityManager.aidl	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/ProfilerInfo.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerShellCommand.java	patch \|	diff1 \|	diff2 \|	blob \| history