主页好友在看
Merge branch 'master' of https://github.com/xichen744/vv_video
icezheng
ice
ice
ice
Merge branch 'master' of https://github.com/xichen744/vv_video

Conflicts:
	vv/.classpath
	vv/AndroidManifest.xml
	vv/bin/AndroidManifest.xml
	vv/bin/classes.dex
	vv/bin/classes/com/tencent/business/activity/VVFriendListActivity$FriendListAdapter.class
	vv/bin/classes/com/tencent/business/activity/VVFriendListActivity.class
	vv/bin/classes/com/tencent/business/activity/VVHomeActivity.class
	vv/bin/classes/com/tencent/business/activity/VVMovieListActivity$2.class
	vv/bin/classes/com/tencent/business/activity/VVMovieListActivity.class
	vv/bin/classes/com/tencent/business/activity/VVSendInviteActivity$1.class
	vv/bin/classes/com/tencent/business/activity/VVSendInviteActivity.class
	vv/bin/classes/com/tencent/business/activity/VVSettingActivity.class
	vv/bin/classes/com/tencent/business/view/GalleryItem.class
	vv/bin/classes/com/tencent/business/view/InviteFeedView$1.class
	vv/bin/classes/com/tencent/business/view/InviteFeedView.class
	vv/bin/classes/com/tencent/component/widget/PullToRefresh/IndicatorLayout.class
	vv/bin/classes/com/tencent/component/widget/PullToRefresh/LoadingLayout.class
	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/classes/com/tencent/widget/VVPullToRefreshListView.class
	vv/bin/dexedLibs/android-support-v4-bb8eaec694f3e4e0bf1d8ca8846f2ef3.jar
	vv/bin/resources.ap_
	vv/bin/vv.apk
	vv/gen/com/tencent/vv/R.java
	vv/src/com/tencent/vv/video/demoActivity.java
	vv/src/com/tencent/widget/wave/WaveView.java