Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev

author Jean-Michel Trivi <jmtrivi@google.com>

Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)

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

Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)
author Jean-Michel Trivi <jmtrivi@google.com>
Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +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	Jean-Michel Trivi <jmtrivi@google.com>
	Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 29 Mar 2017 17:48:23 +0000 (17:48 +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