tree 8a6b5cc6c961891ac4512e2312b80be03e471bb0
parent ed34b244f1665b604d2a291db504415b10a514d7
parent 06e8cdc0f81ead604d5adf9d7b3f982e10226fd2
author Hung-ying Tyan <tyanh@google.com> 1291188100 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291188100 -0800

am 06e8cdc0: Fix race between ending and answering a SIP call.

* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
  Fix race between ending and answering a SIP call.