tree d062782ca611a899ab3b671399a1b894c87650c3
parent 4039488ef1de5be6a63b9111839f61d8b4d509e7
parent e6de96e55d50429d5a674a329bdf380c78e25dc1
author Roshan Pius <rpius@google.com> 1445027438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445027438 +0000

am e6de96e5: am 27785ea6: DO NOT MERGE Disallow call unhold if the fg call is dialing.

* commit 'e6de96e55d50429d5a674a329bdf380c78e25dc1':
  DO NOT MERGE Disallow call unhold if the fg call is dialing.