Merge "JNI plumbing for native audio routing API" into nyc-dev am: 0a8b9069b3

author Paul McLean <pmclean@google.com>

Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +0000)

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

Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +0000)
author Paul McLean <pmclean@google.com>
Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +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	Paul McLean <pmclean@google.com>
	Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 26 Feb 2016 17:38:17 +0000 (17:38 +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