cx
Merge branch 'master' of https://github.com/xichen744/vv_video

Conflicts:
	vv/.classpath
	vv/AndroidManifest.xml
	vv/bin/AndroidManifest.xml
	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/ext/utils/LocalConfig.java
	vv/gen/com/tencent/vv/R.java
	vv/res/drawable/vv_expression_pack.xml
	vv/res/drawable/vv_feed_at_pack.xml
	vv/res/layout/title_bar_main.xml
	vv/res/layout/vv_comment_panel_lite.xml
	vv/res/layout/vv_friends_friendlist.xml
	vv/res/layout/vv_item_comment.xml
	vv/res/layout/vv_item_gallery.xml
	vv/res/layout/vv_item_invite_feed_btm.xml
	vv/res/layout/vv_item_invite_feed_view.xml
	vv/res/layout/vv_item_invite_title.xml
	vv/res/layout/vv_item_movie_list.xml
	vv/res/layout/vv_layout_search.xml
	vv/res/layout/vv_login_layout.xml
	vv/res/layout/vv_movie_detail.xml
	vv/res/layout/vv_movies_lis.xml
	vv/res/layout/vv_play_room.xml
	vv/res/layout/vv_send_dialog.xml
	vv/res/layout/vv_send_invite.xml
	vv/res/values/dimens.xml
	vv/res/values/vv_colors_list.xml
	vv/src/com/tencent/business/activity/VVPlayRoomActivity.java