am 8785c064: Merge change Ie5df08ef into eclair-mr2

Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp

* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
  Let PLUS occur once anywhere in dial-str network portion.