ef36ef67e009449300b0150c60c9f637e205d79e - fp2-dev/platform/frameworks/opt/net/ims

commit	ef36ef67e009449300b0150c60c9f637e205d79e	[log] [tgz]
author	Wink Saville <wink@google.com>	Wed Jun 11 08:39:38 2014 -0700
committer	Wink Saville <wink@google.com>	Wed Jun 11 15:12:44 2014 -0700
tree	1ae6176e55381f8337780b00f3b29f6d951b42d2
parent	7a655848f691c0d27421b293f96782a1bd5fb081 [diff]

Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04

Android.mk[Added - diff]
CleanSpec.mk[Added - diff]
README.txt[Added - diff]
src/java/com/android/ims/ImsCall.java[Added - diff]
src/java/com/android/ims/ImsCallForwardInfo.aidl[Added - diff]
src/java/com/android/ims/ImsCallForwardInfo.java[Added - diff]
src/java/com/android/ims/ImsCallGroup.java[Added - diff]
src/java/com/android/ims/ImsCallProfile.aidl[Added - diff]
src/java/com/android/ims/ImsCallProfile.java[Added - diff]
src/java/com/android/ims/ImsConferenceState.aidl[Added - diff]
src/java/com/android/ims/ImsConferenceState.java[Added - diff]
src/java/com/android/ims/ImsConnectionStateListener.java[Added - diff]
src/java/com/android/ims/ImsException.java[Added - diff]
src/java/com/android/ims/ImsManager.java[Added - diff]
src/java/com/android/ims/ImsReasonInfo.aidl[Added - diff]
src/java/com/android/ims/ImsReasonInfo.java[Added - diff]
src/java/com/android/ims/ImsServiceClass.java[Added - diff]
src/java/com/android/ims/ImsSsInfo.aidl[Added - diff]
src/java/com/android/ims/ImsSsInfo.java[Added - diff]
src/java/com/android/ims/ImsStreamMediaProfile.aidl[Added - diff]
src/java/com/android/ims/ImsStreamMediaProfile.java[Added - diff]
src/java/com/android/ims/ImsUt.java[Added - diff]
src/java/com/android/ims/ImsUtInterface.java[Added - diff]
src/java/com/android/ims/internal/CallGroup.java[Added - diff]
src/java/com/android/ims/internal/CallGroupManager.java[Added - diff]
src/java/com/android/ims/internal/ICall.java[Added - diff]
src/java/com/android/ims/internal/ICallGroup.java[Added - diff]
src/java/com/android/ims/internal/IImsCallSession.aidl[Added - diff]
src/java/com/android/ims/internal/IImsCallSessionListener.aidl[Added - diff]
src/java/com/android/ims/internal/IImsRegistrationListener.aidl[Added - diff]
src/java/com/android/ims/internal/IImsService.aidl[Added - diff]
src/java/com/android/ims/internal/IImsStreamMediaSession.aidl[Added - diff]
src/java/com/android/ims/internal/IImsUt.aidl[Added - diff]
src/java/com/android/ims/internal/IImsUtListener.aidl[Added - diff]
src/java/com/android/ims/internal/ImsCallSession.java[Added - diff]
src/java/com/android/ims/internal/ImsStreamMediaSession.java[Added - diff]

36 files changed

tree: 1ae6176e55381f8337780b00f3b29f6d951b42d2