Merge "Updates based on API council guidance." into oc-dev

author Jeff Sharkey <jsharkey@google.com>

Mon, 1 May 2017 18:36:18 +0000 (18:36 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 1 May 2017 18:36:25 +0000 (18:36 +0000)
author Jeff Sharkey <jsharkey@google.com>
Mon, 1 May 2017 18:36:18 +0000 (18:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 1 May 2017 18:36:25 +0000 (18:36 +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
diff --cc core/java/android/view/autofill/AutofillManager.java
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Mon, 1 May 2017 18:36:18 +0000 (18:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 1 May 2017 18:36:25 +0000 (18:36 +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
core/java/android/view/autofill/AutofillManager.java	patch \|	diff1 \|	diff2 \|	blob \| history