tree d61b49b2d1d6b0c5dc520f111312df0a066ee478
parent 981f7da8de8fcbf4acfa877a8a88c70ec480dcdd
parent caf84dca8bd90016d910198f1b178ac03e82dd07
author Roshan Pius <rpius@google.com> 1442854291 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442854291 +0000

Merge "Disallow call unhold if the fg call is dialing."