Merge "Fix AudioTrack and AudioRecord documentation" into nyc-dev

author Eric Laurent <elaurent@google.com>

Tue, 24 May 2016 17:43:34 +0000 (17:43 +0000)

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

Tue, 24 May 2016 17:43:34 +0000 (17:43 +0000)
author Eric Laurent <elaurent@google.com>
Tue, 24 May 2016 17:43:34 +0000 (17:43 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 17:43:34 +0000 (17:43 +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	Eric Laurent <elaurent@google.com>
	Tue, 24 May 2016 17:43:34 +0000 (17:43 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 24 May 2016 17:43:34 +0000 (17:43 +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