Ramesh Sudini c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type. ...

Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91

2011-03-14 13:44:30 -07:00

..

config

…

java

Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

2011-03-14 13:41:26 -07:00

jni

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

2011-03-11 16:31:55 -08:00

res

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

2011-03-14 13:44:30 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00