tree f5e0fc1cd3b178309d3c3f39319b25db8a280204
parent 29e5c7d4a23832a4bed51086d2cafedbadbffb12
parent 697f649547b0a60a745f4236d2c2f04ec99764c3
author Tyler Gunn <tgunn@google.com> 1502737741 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502737741 +0000

Merge "Update string for failure to add call due to ongoing VT call." into oc-mr1-dev