11111
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tv/danmaku/ijk/media/app/AppConst.java
	src/tv/danmaku/ijk/media/app/activity/ChannelListActivity.java