CNLive Android Team / CNStreamDemo · Commits

# Conflicts:
#	app/libs/libcnlivevideo.jar

# Conflicts:
#	build.gradle

Conflicts:
	app/libs/libcnlivestream.jar

Conflicts:
	app/libs/libcnlivestream.jar
	app/libs/libcnliveutil.jar