123
Merge branch 'master' of https://github.com/xichen744/vv_video
ice
icezheng
231
Merge branch 'master' of https://github.com/xichen744/vv_video

Conflicts:
	vv/.classpath
	vv/bin/classes.dex
	vv/bin/classes/com/tencent/vv/R$color.class
	vv/bin/classes/com/tencent/vv/R$dimen.class
	vv/bin/classes/com/tencent/vv/R$drawable.class
	vv/bin/classes/com/tencent/vv/R$id.class
	vv/bin/classes/com/tencent/vv/R$integer.class
	vv/bin/classes/com/tencent/vv/R$layout.class
	vv/bin/classes/com/tencent/vv/R$menu.class
	vv/bin/classes/com/tencent/vv/R$string.class
	vv/bin/classes/com/tencent/vv/R$style.class
	vv/bin/classes/com/tencent/vv/R$styleable.class
	vv/bin/resources.ap_
	vv/bin/vv.apk
	vv/gen/com/tencent/vv/R.java
	vv/project.properties
	vv/res/layout/vv_play_room.xml
	vv/src/com/tencent/business/activity/VVPlayRoomActivity.java