OSDN Git Service

Merge commit '617c80a'
authorMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:42:25 +0000 (17:42 -0700)
committerMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 00:42:25 +0000 (17:42 -0700)
commit0b934ade258294987f8bde9cd338d7b635522719
treec4275d7c16157f0f195850f9cdecd14131224de6
parent7c85ce853421f6299eb5fd05782cf9e25a8f2071
parent617c80a82e5620b2f16348e4bd3d7fc3b76e9021
Merge commit '617c80a'

Add a bridge implementation of get_master_volume.

Conflicts:
audio/audio_hw_hal.cpp

Change-Id: Icff9d8dce05d1d811fca815cc39cb38a1df293f9
audio/AudioHardwareInterface.cpp
audio/audio_hw_hal.cpp
include/hardware_legacy/AudioHardwareInterface.h