Merge changes from topic 'api_review' into nyc-dev

author Julia Reynolds <juliacr@google.com>

Tue, 26 Apr 2016 15:29:09 +0000 (15:29 +0000)

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

Tue, 26 Apr 2016 15:29:11 +0000 (15:29 +0000)
author Julia Reynolds <juliacr@google.com>
Tue, 26 Apr 2016 15:29:09 +0000 (15:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Apr 2016 15:29:11 +0000 (15:29 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Tue, 26 Apr 2016 15:29:09 +0000 (15:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Apr 2016 15:29:11 +0000 (15:29 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history