CNLive Android Team / CNVideoDemo · Commits

# Conflicts:
#	app/libs/libcnliveutil.jar

# Conflicts:
#	app/libs/libcnlivevideo.jar
#	app/src/main/java/com/cnlive/demo/video/VideoStatusActivity.java

Conflicts:
	app/libs/libcnlivevideo.jar