tree 66c37d1727fd010a60c6aa9eb3fa62389ce064ab
parent 612242bee7fedc4e8a7a0748aa7882cdf919495e
parent 4e8d8253700a692fb30c4f7ba03be5189b0f94ac
author The Android Open Source Project <initial-contribution@android.com> 1278715997 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278715997 -0700

am 3dbbf2dc: ignore from open-source master

Merge commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270'

* commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270':
  Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently