tree b566df5c9edc4406cec303567de129531c873214
parent ebcdd0ab96e06c9898ab1e9f0b53a8f3ec72521b
parent c06c5c1a13da26c8435f2d4b72a41a38e1d463b8
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.