添加文件处理类
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/bin/resources.ap_