tree aab456746a87080f3777cd2506e94fae18f43931
parent 732e0d2e1725aeaf4595ba90b4334498ce80cd11
parent 846d2b4f2741508f170e560134ff9797316e3515
author Ramesh Sudini <ramesh.sudini@motorola.com> 1300135662 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300135662 -0700

am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.

* commit 'c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
  Do not merge: Telephony: Fix config to reflect the correct CM conn type.