Jake Hamby cc8c6496b7 resolved conflicts for merge of 3543a40b to master ...

Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431

2010-10-01 18:35:13 -07:00

..

sms

resolved conflicts for merge of 3543a40b to master

2010-10-01 18:35:13 -07:00

CallFailCause.java

…

CdmaCall.java

Add register methods in CallManager "do not merge"

2010-08-02 15:33:48 -07:00

CdmaCallTracker.java

Fix some typos and other cosmetic cleanups in telephony framework.

2010-05-13 17:44:26 -07:00

CdmaCallWaitingNotification.java

…

CdmaConnection.java

merge from open-source master

2010-05-12 14:39:38 -07:00

CdmaDataConnection.java

Add support for DUN over a cdma connection.

2010-03-18 17:43:42 -07:00

CdmaDataConnectionTracker.java

Add LinkCapabilities

2010-09-16 21:26:59 -07:00

CdmaInformationRecords.java

Cleanup comments, see bug 2401350.

2010-02-01 16:26:00 -08:00

CdmaMmiCode.java

Telephony: Add PUK MMI code support for CDMA RUIM phones

2010-04-13 14:58:41 -07:00

CDMAPhone.java

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07:00

CdmaServiceStateTracker.java

am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."

2010-10-01 17:07:58 -07:00

CdmaSMSDispatcher.java

am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

2010-09-03 13:27:51 -07:00

EriInfo.java

Add Copyright assignement.

2010-03-12 09:04:48 -08:00

EriManager.java

Add Copyright assignement.

2010-03-12 09:04:48 -08:00

package.html

…

RuimCard.java

…

RuimFileHandler.java

…

RuimPhoneBookInterfaceManager.java

Calling super.finalize() in finalize() methods.

2010-02-22 16:29:10 -08:00

RuimRecords.java

Cleanup comments, see bug 2401350.

2010-02-01 16:26:00 -08:00

RuimSmsInterfaceManager.java

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07:00

SignalToneUtil.java

cdma tones: Fix Call Waiting Tone in the hash map

2009-11-25 09:31:53 -08:00

SmsMessage.java

resolved conflicts for merge of 3543a40b to master

2010-10-01 18:35:13 -07:00

TtyIntent.java

Fix some typos and other cosmetic cleanups in telephony framework.

2010-05-13 17:44:26 -07:00