Merge kwd to master
authorWink Saville <wink@google.com>
Wed, 11 Jun 2014 15:39:38 +0000 (08:39 -0700)
committerWink Saville <wink@google.com>
Wed, 11 Jun 2014 22:12:44 +0000 (15:12 -0700)
commitef36ef67e009449300b0150c60c9f637e205d79e
tree1ae6176e55381f8337780b00f3b29f6d951b42d2
parent7a655848f691c0d27421b293f96782a1bd5fb081
Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
36 files changed:
Android.mk [new file with mode: 0644]
CleanSpec.mk [new file with mode: 0644]
README.txt [new file with mode: 0644]
src/java/com/android/ims/ImsCall.java [new file with mode: 0644]
src/java/com/android/ims/ImsCallForwardInfo.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsCallForwardInfo.java [new file with mode: 0644]
src/java/com/android/ims/ImsCallGroup.java [new file with mode: 0644]
src/java/com/android/ims/ImsCallProfile.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsCallProfile.java [new file with mode: 0644]
src/java/com/android/ims/ImsConferenceState.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsConferenceState.java [new file with mode: 0644]
src/java/com/android/ims/ImsConnectionStateListener.java [new file with mode: 0644]
src/java/com/android/ims/ImsException.java [new file with mode: 0644]
src/java/com/android/ims/ImsManager.java [new file with mode: 0644]
src/java/com/android/ims/ImsReasonInfo.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsReasonInfo.java [new file with mode: 0644]
src/java/com/android/ims/ImsServiceClass.java [new file with mode: 0644]
src/java/com/android/ims/ImsSsInfo.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsSsInfo.java [new file with mode: 0644]
src/java/com/android/ims/ImsStreamMediaProfile.aidl [new file with mode: 0644]
src/java/com/android/ims/ImsStreamMediaProfile.java [new file with mode: 0644]
src/java/com/android/ims/ImsUt.java [new file with mode: 0644]
src/java/com/android/ims/ImsUtInterface.java [new file with mode: 0644]
src/java/com/android/ims/internal/CallGroup.java [new file with mode: 0644]
src/java/com/android/ims/internal/CallGroupManager.java [new file with mode: 0644]
src/java/com/android/ims/internal/ICall.java [new file with mode: 0644]
src/java/com/android/ims/internal/ICallGroup.java [new file with mode: 0644]
src/java/com/android/ims/internal/IImsCallSession.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsCallSessionListener.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsRegistrationListener.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsService.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsStreamMediaSession.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsUt.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/IImsUtListener.aidl [new file with mode: 0644]
src/java/com/android/ims/internal/ImsCallSession.java [new file with mode: 0644]
src/java/com/android/ims/internal/ImsStreamMediaSession.java [new file with mode: 0644]