tree da3c3ababfd0148c1c2beae7e2486511e5ff24b4
parent 1a38d7984d95c07ce43d77d9a9aaa9f497656bf6
parent 39daad3648bc8a6f623d03ffaab005867495e1f0
author Christine Chen <christinech@google.com> 1381257317 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381257317 -0700

am 9b98b9f7: am 974a6e8d: Merge "Adds support for texting after phone disconnects." into klp-dev

* commit '9b98b9f7a40d41e18e6d5acff3a3c70200896522':
  Adds support for texting after phone disconnects.