tree 5e147fef9b3b122053ac0ff74a09b4809edcbf7e
parent c1cc9ba6d1e2b7f1e213d215e3edb97acea79901
parent 6e25789fbe7ac283021156b17f406acb48850292
author Wink Saville <wink@google.com> 1297287765 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297287765 -0800

am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation