tree a42144733930031e9a8d0adaf435fece2902793e
parent 1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff
parent 952f6bf80858c1ef3543d9b93fa04a5a175f2026
author John Grossman <johngro@google.com> 1344463847 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344463847 -0700

am 952f6bf8: (-s ours) am 3f0b1eaa: Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev

* commit '952f6bf80858c1ef3543d9b93fa04a5a175f2026':
  Change audio flinger to user HAL master mute if available