tree 848215b7a99366aba1896b2e7bc2357f97ac00c9
parent 8190752da6481f7c8948962d6fb805a0363ce652
parent 9b41ac7ba55c0f6ee044ef1279941ab3fe1e2a06
author The Android Open Source Project <initial-contribution@android.com> 1351700590 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700590 -0700

am 9b41ac7b: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '9b41ac7ba55c0f6ee044ef1279941ab3fe1e2a06':
  Revert "alsa_sound: change voice-call stop sequence"
  alsa_sound: change voice-call stop sequence