Merge "Fix issue #37324532: API Review: android.content.pm.InstrumentationInfo" into...

author Dianne Hackborn <hackbod@google.com>

Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)

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

Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
author Dianne Hackborn <hackbod@google.com>
Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history