johnwang 01ae863611 resolved conflicts for merge of 696b912e to eclair ...

modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

	modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

2009-08-17 19:20:07 -07:00

..

android/telephony

Fix the issue of incorrect conversion of the plus sign in a dial string.

2009-08-12 15:41:33 -07:00

com/android/internal/telephony

resolved conflicts for merge of 696b912e to eclair

2009-08-17 19:20:07 -07:00