| commit | 0b934ade258294987f8bde9cd338d7b635522719 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@google.com> | Wed Mar 21 17:42:25 2012 -0700 |
| committer | Mike Lockwood <lockwood@google.com> | Wed Mar 21 17:42:25 2012 -0700 |
| tree | c4275d7c16157f0f195850f9cdecd14131224de6 | |
| parent | 7c85ce853421f6299eb5fd05782cf9e25a8f2071 [diff] | |
| parent | 617c80a82e5620b2f16348e4bd3d7fc3b76e9021 [diff] |
Merge commit '617c80a' Add a bridge implementation of get_master_volume. Conflicts: audio/audio_hw_hal.cpp Change-Id: Icff9d8dce05d1d811fca815cc39cb38a1df293f9