Evan Charlton a3db733885 resolved conflicts for merge of 8d966e42 to master-nova ...

Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6

2014-04-16 13:14:39 -07:00

..

cdma

…

gsm

…

CallStateListener.java

resolved conflicts for merge of 74fb97de to master

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

CellIdentityCdma.java

…

CellIdentityGsm.java

…

CellIdentityLte.java

…

CellIdentityWcdma.java

…

CellInfo.aidl

…

CellInfo.java

…

CellInfoCdma.java

…

CellInfoGsm.java

…

CellInfoLte.java

…

CellInfoWcdma.java

…

CellLocation.java

…

CellSignalStrength.java

…

CellSignalStrengthCdma.java

Correct some comments (LTE->CDMA)

2014-04-11 14:23:38 +00:00

CellSignalStrengthGsm.java

…

CellSignalStrengthLte.java

…

CellSignalStrengthWcdma.java

…

DataConnectionRealTimeInfo.aidl

Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

2014-04-15 22:04:10 -07:00

DataConnectionRealTimeInfo.java

Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

2014-04-15 22:04:10 -07:00

DisconnectCause.java

Add disconnect cause to setDisconnected.

2014-03-31 14:58:11 -07:00

JapanesePhoneNumberFormatter.java

…

NeighboringCellInfo.aidl

…

NeighboringCellInfo.java

…

package.html

…

PhoneNumberFormattingTextWatcher.java

…

PhoneNumberUtils.java

…

PhoneStateListener.java

Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

2014-04-15 22:04:10 -07:00

PreciseCallState.aidl

…

PreciseCallState.java

…

PreciseDataConnectionState.aidl

…

PreciseDataConnectionState.java

…

PreciseDisconnectCause.java

…

Rlog.java

…

ServiceState.aidl

…

ServiceState.java

…

SignalStrength.aidl

…

SignalStrength.java

…

TelephonyManager.java

resolved conflicts for merge of 5e44cadf to master-nova

2014-03-25 13:16:40 -07:00

ThirdPartyCallListener.java

Delete Third Party Call APIs

2014-02-18 17:04:10 -08:00

ThirdPartyCallProvider.java

Delete Third Party Call APIs

2014-02-18 17:04:10 -08:00

ThirdPartyCallSendDtmfCallback.java

DO NOT MERGE ThirdPartyCallSendDtmfCallBack API

2014-02-11 22:22:42 -08:00

ThirdPartyCallService.java

Delete Third Party Call APIs

2014-02-18 17:04:10 -08:00