dsfs

Signed-off-by: gongsi <gongsi@163.com>
Merge branch 'develop' into gongsi

Conflicts:
	weipai/AndroidManifest.xml
	weipai/src/com/example/downloadtest/providers/downloads/Downloads.java
	weipai/src/com/weipai/common/AppManager.java

Signed-off-by: gongsi <gongsi@163.com>
xcxc
Signed-off-by: gongsi <gongsi@163.com>
Merge branch 'develop' into gongsi

Conflicts:
	weipai/src/com/weipai/fragment/DownlodFragment.java
Merge branch 'develop' into gongsi
Merge branch 'develop' into gongsi

Conflicts:
	weipai/src/com/weipai/fragment/VideoFragment.java
Merge branch 'develop' into gongsi
aaa
Signed-off-by: gongsi <gongsi@163.com>
Merge branch 'develop' into gongsi
Merge branch 'develop' into gongsi
111
Signed-off-by: gongsi <gongsi@163.com>