Merge "Respond to API council feedback." into oc-dev

author Jeff Sharkey <jsharkey@android.com>

Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)

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

Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)
author Jeff Sharkey <jsharkey@android.com>
Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +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 core/res/AndroidManifest.xml
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +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
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history