Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254 am: db080...

author Leonard Mosescu <mosescu@google.com>

Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)

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

Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)
author Leonard Mosescu <mosescu@google.com>
Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)
diff --cc core/java/android/app/ActivityThread.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Leonard Mosescu <mosescu@google.com>
	Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Feb 2017 23:37:48 +0000 (23:37 +0000)
		1	2
core/java/android/app/ActivityThread.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history