Amit Mahajan d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 ...

Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c

2014-10-06 21:57:42 -07:00

..

CallerInfo.java

Add lookup key to callerInfo

2014-08-29 18:40:09 -07:00

CallerInfoAsyncQuery.java

Use "current" cp2 from telephony

2014-07-17 15:57:49 -07:00

CallInfo.aidl

…

CallInfo.java

…

DcParamObject.java

ksd to lmp-sprout-dev

2014-09-01 05:38:31 +00:00

DctConstants.java

ksd to lmp-sprout-dev

2014-09-01 05:38:31 +00:00

EncodeException.java

…

GsmAlphabet.java

Sms7BitEncodingTranslator

2014-10-07 01:02:04 +00:00

ICallService.aidl

…

ICallServiceAdapter.aidl

…

IccCardConstants.java

…

IMms.aidl

Send and download MMS via content provider instead of PDU bytes.

2014-09-11 14:17:15 -07:00

IPhoneStateListener.aidl

redirect RIL_UNSOL_OEM_HOOK_RAW to system app

2014-09-27 07:16:38 +00:00

IPhoneSubInfo.aidl

am 5dac65ad: Change suffix UsingSubId to ForSubscriber.

2014-09-09 17:46:37 +00:00

ISms.aidl

Change suffix UsingSubId to ForSubscriber.

2014-09-09 17:38:19 +00:00

ISub.aidl

Change suffix UsingSubId to ForSubscriber.

2014-09-09 17:38:19 +00:00

ITelephony.aidl

am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev

2014-09-11 16:00:55 +00:00

ITelephonyRegistry.aidl

redirect RIL_UNSOL_OEM_HOOK_RAW to system app

2014-09-27 07:16:38 +00:00

IWapPushManager.aidl

…

OperatorInfo.aidl

…

package.html

…

PhoneConstants.java

Prepare to make SubscriptionManager public.

2014-09-02 22:46:42 -07:00

RILConstants.java

ksd to lmp-sprout-dev

2014-09-01 05:38:31 +00:00

SmsConstants.java

…

SmsRawData.aidl

…

SmsRawData.java

…

TelephonyIntents.java

Prepare to make SubscriptionManager public.

2014-09-02 22:46:42 -07:00

TelephonyProperties.java

change the property name about IDP from 'telephony.' to 'gsm.'

2014-09-08 16:47:15 -07:00