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

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 29 Mar 2017 17:39:57 +0000 (17:39 +0000)

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

Wed, 29 Mar 2017 17:40:01 +0000 (17:40 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 29 Mar 2017 17:39:57 +0000 (17:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 29 Mar 2017 17:40:01 +0000 (17:40 +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	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 29 Mar 2017 17:39:57 +0000 (17:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 29 Mar 2017 17:40:01 +0000 (17:40 +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