| commit | a49848ce58ad087a8dd8515d6ca39e411581941a | [log] [tgz] |
|---|---|---|
| author | Ramesh Sudini <ramesh.sudini@motorola.com> | Mon Mar 14 13:49:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 13:49:21 2011 -0700 |
| tree | 6d362a266557b90295fa9667d58c8e4325085dd7 | |
| parent | b45f4131b7206d561bfec2827ae7782dbaabf65c [diff] | |
| parent | 0eca33c915db932489100fccd97ae2ee03aaacc5 [diff] |
am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. * commit 'ea93d815ac33bf8ef0896b25fbf0185e6d6e82aa': Do not merge: Telephony: Fix config to reflect the correct CM conn type.