Gabriel Peal db0dca826d resolved conflicts for merge of c1edfc2c to master ...

attempt 2

Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc

2014-03-25 13:39:55 -07:00

..

CallerInfo.java

Fix CountryDetector NPE

2013-10-21 11:57:20 -07:00

CallerInfoAsyncQuery.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

DctConstants.java

Telephony: Handle DATA_CALL_LIST in DCC.

2014-01-15 13:01:52 -08:00

EncodeException.java

…

GsmAlphabet.java

am be5316e0: Merge "Use Rlog"

2012-12-08 13:11:45 -08:00

IccCardConstants.java

Telephony: Clarify IccCardConstants.State enum

2012-09-05 10:10:06 -07:00

IPhoneStateListener.aidl

Telephony API extension v2

2014-01-10 11:08:06 +01:00

IPhoneSubInfo.aidl

make new API to retrieve group identifier level1

2013-03-27 17:24:55 +00:00

ISms.aidl

Telephony: SMS over IMS

2013-10-10 23:23:48 +00:00

ITelephony.aidl

resolved conflicts for merge of 74fb97de to master

2014-03-25 11:08:19 -07:00

ITelephonyListener.aidl

resolved conflicts for merge of c1edfc2c to master

2014-03-25 13:39:55 -07:00

ITelephonyRegistry.aidl

Telephony API extension v2

2014-01-10 11:08:06 +01:00

IWapPushManager.aidl

…

OperatorInfo.aidl

…

package.html

…

PhoneConstants.java

resolved conflicts for merge of 396b9e79 to master

2014-02-13 11:48:48 +00:00

RILConstants.java

Remove unneeded new RIL command.

2014-02-24 11:42:51 -08:00

SmsConstants.java

Telephony: SMS over IMS

2013-10-10 23:23:48 +00:00

SmsRawData.aidl

Move a few files from frameworks/opt/telephony to frameworks/base.

2013-02-07 17:03:05 -08:00

SmsRawData.java

Move a few files from frameworks/opt/telephony to frameworks/base.

2013-02-07 17:03:05 -08:00

TelephonyIntents.java

Add new RIL commands to read/write NV items and reset NV config.

2014-02-03 15:52:18 -08:00

TelephonyProperties.java

If no NITZ information use Country Code to set TimeZone.

2012-03-01 10:25:48 -08:00