Merge "N is API 24" into nyc-dev am: bc983c4431

author Adam Powell <adamp@google.com>

Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)

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

Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)
author Adam Powell <adamp@google.com>
Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Adam Powell <adamp@google.com>
	Thu, 26 May 2016 01:59:49 +0000 (01:59 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 26 May 2016 01:59:49 +0000 (01:59 +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