无改动
f
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/bin/AndroidManifest.xml
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/bin/dexedLibs/httpmime-4.1.1-f344a12db83ea3131f33d17215de2dac.jar
	MediaPlayer/bin/resources.ap_
	MediaPlayer/src/com/mediaplayer/adpter/Adpter.java
Merge branch 'master' of https://github.com/429365799/Android-Traning.git
多文件上传