From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Wed, 29 Mar 2017 17:53:56 +0000 (+0000)
Subject: Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev am... 
X-Git-Tag: android-x86-8.1-r1~2011
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba6cb09e57364e8049e8e2dc46db2922e7b545d2;p=android-x86%2Fframeworks-base.git

Merge "AudioAttributes: make getVolumeControlStream() non static" into oc-dev am: bf6b4efa6d
am: 4c51b4470c

Change-Id: Ibdf82f804c29a786173584833f1796ed399bea3b
---

ba6cb09e57364e8049e8e2dc46db2922e7b545d2