tree 7102f0993e90834984c91e0d5beddc7f7a01f4ac
parent 6ebf0aa4df1a2484f52a894384286a084ac0a129
parent cf7bd88327618664ea31bc9ee2cb76368d0de44b
author The Android Open Source Project <initial-contribution@android.com> 1349194887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349194887 -0700

am cf7bd883: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cf7bd88327618664ea31bc9ee2cb76368d0de44b':
  alsa_audio: route call voice to phone when on HDMI
  alsa_sound: fix for SIP call mute issue.
  Revert "alsa_sound: fix for SIP call mute issue."
  alsa_sound: fix for SIP call mute issue.
  alsa_sound: fix for output device routing during video chat
  audio: add the headset tx
  hardware/alsa_sound: Change the device disable sequence