CNLive Android Team / CNVideoDemo · Commits

# Conflicts:
#	app/libs/libcnliveutil.jar
#	app/libs/libcnlivevideo.jar
#	doc/Android播放SDK说明文档 .pdf

# Conflicts:
#	app/libs/libcnliveutil.jar