Merge "Updates based on API council guidance." into oc-dev am: 3ba7117164

author Jeff Sharkey <jsharkey@google.com>

Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)

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

Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)
author Jeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 18:52:23 +0000 (18:52 +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/java/android/app/ActivityManager.java
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Mon, 1 May 2017 18:52:23 +0000 (18:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 1 May 2017 18:52:23 +0000 (18:52 +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/java/android/app/ActivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history