am 6286f311: Merge change 25810 into eclair

Merge commit '6286f311c3b80ee6b4b1985a290a889f895203f9' into eclair-plus-aosp

* commit '6286f311c3b80ee6b4b1985a290a889f895203f9':
  Fix pause-wait dial string conversion error