| commit | b9382ba7994d215ccc93b6e85e6fc9f7981d181e | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Oct 16 21:09:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 21:09:37 2015 +0000 |
| tree | 3ea3a54b3225d42ef9b972fb91214b29933babc8 | |
| parent | b121103591c3764ddf1e0e0308397d2f4fed8f8d [diff] | |
| parent | 081f324f45b955c419c9418da36d0e127ae3fb81 [diff] |
am 081f324f: (-s ours) am 2c41b036: am e6de96e5: am 27785ea6: DO NOT MERGE Disallow call unhold if the fg call is dialing. * commit '081f324f45b955c419c9418da36d0e127ae3fb81': DO NOT MERGE Disallow call unhold if the fg call is dialing.