tree 9b6d3352adf98d262f3d7e1806b6e66f05f97123
parent 6a7ca8f807c842fe5f4ed14df25f4f919b6ab116
parent 823fbbbab5856fa46f56c7acbdddaa50bf211d09
author Amith Yamasani <yamasani@google.com> 1296778417 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296778417 -0800

am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb

* commit '823fbbbab5856fa46f56c7acbdddaa50bf211d09':
  Expanded volume panel with sliders and mute buttons.