New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mmc broadcasts #320

Merged
merged 10 commits into from Jun 30, 2016

Conversation

Projects
None yet
3 participants
@bscheurman
Contributor

bscheurman commented Jun 29, 2016

Adds private intents to inform QoS library of phone call states
recently merged from master

bscheurman added some commits Sep 29, 2015

Merge branch 'master' of https://github.com/RestComm/restcomm-android…
…-sdk

Conflicts:
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java
Merge branch 'brad-broadcasts' into mmc-broadcasts
Conflicts:
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCConnection.java
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java
Merge branch 'master' into mmc-broadcasts
Conflicts:
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCConnection.java
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java
Merge branch 'parent-master' into mmc-broadcasts
Conflicts:
	restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCConnection.java

@atsakiridis atsakiridis merged commit 79e124d into RestComm:master Jun 30, 2016

@deruelle deruelle removed the peer review label Jun 30, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment