Tyler Gunn 5819755163 resolve merge conflicts of d04c51ea37 to nyc-mr2-dev-plus-aosp ...

Test: Fix build.
Change-Id: I5808fc02502ced2195728ad146ef5523a8eb19ae

2017-02-03 13:41:17 -08:00

..

internal

Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0 am: 64057ab972

2017-01-26 01:49:53 +00:00

ImsCallForwardInfo.aidl

…

ImsCallForwardInfo.java

IMS: Constants For Audio Quality, Supp. Services

2016-02-03 14:24:45 -08:00

ImsCallProfile.aidl

…

ImsCallProfile.java

Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems.

2016-07-13 17:25:37 -07:00

ImsConferenceState.aidl

…

ImsConferenceState.java

…

ImsConfigListener.aidl

…

ImsExternalCallState.aidl

IMS: Changes for MultiEndpoint

2016-03-11 16:08:06 -08:00

ImsExternalCallState.java

Finalize MEP functionality.

2016-07-11 10:33:37 -07:00

ImsReasonInfo.aidl

…

ImsReasonInfo.java

Add "wifi lost" disconnect cause.

2017-02-03 19:05:18 +00:00

ImsSsInfo.aidl

…

ImsSsInfo.java

MWI,phantom call,Suppl services, error codes

2015-07-06 11:28:19 -07:00

ImsStreamMediaProfile.aidl

…

ImsStreamMediaProfile.java

IMS: Constants For Audio Quality, Supp. Services

2016-02-03 14:24:45 -08:00

ImsSuppServiceNotification.aidl

MWI,phantom call,Suppl services, error codes

2015-07-06 11:28:19 -07:00

ImsSuppServiceNotification.java

MWI,phantom call,Suppl services, error codes

2015-07-06 11:28:19 -07:00