更换图片
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	MediaPlayer/AndroidManifest.xml
	MediaPlayer/bin/AndroidManifest.xml
	MediaPlayer/bin/MediaPlayer.apk
	MediaPlayer/bin/classes.dex
	MediaPlayer/bin/dexedLibs/android-support-v7-appcompat-b8e5f6d6d316816c9fd04792dd5e7a73.jar
	MediaPlayer/bin/resources.ap_
	MediaPlayer/res/layout/activity_main.xml
	MediaPlayer/res/values/strings.xml
	MediaPlayer/src/com/example/mediaplayer/MainActivity.java
Merge branch 'master' of https://github.com/429365799/Android-Traning.git
修改界面