new file:   .classpath
	new file:   .project
	new file:   AndroidManifest.xml
	new file:   bin/AndroidManifest.xml
	new file:   bin/VideoPlayer.apk
	new file:   bin/aidl/com/wood/videoplayer/fileinfo/VideoInfo.aidl
	new file:   bin/classes.dex
	new file:   bin/classes/com/wood/videoplayer/BuildConfig.class
	new file:   bin/classes/com/wood/videoplayer/MainActivity$1.class
	new file:   bin/classes/com/wood/videoplayer/MainActivity.class
	new file:   bin/classes/com/wood/videoplayer/NativeFileFragment$Onchange.class
	new file:   bin/classes/com/wood/videoplayer/NativeFileFragment.class
	new file:   bin/classes/com/wood/videoplayer/NetFileFragment.class
	new file:   bin/classes/com/wood/videoplayer/PlayActivity$1.class
	new file:   bin/classes/com/wood/videoplayer/PlayActivity$2.class
	new file:   bin/classes/com/wood/videoplayer/PlayActivity.class
	new file:   bin/classes/com/wood/videoplayer/R$attr.class
	new file:   bin/classes/com/wood/videoplayer/R$dimen.class
	new file:   bin/classes/com/wood/videoplayer/R$drawable.class
	new file:   bin/classes/com/wood/videoplayer/R$id.class
	new file:   bin/classes/com/wood/videoplayer/R$layout.class
	new file:   bin/classes/com/wood/videoplayer/R$menu.class
	new file:   bin/classes/com/wood/videoplayer/R$string.class
	new file:   bin/classes/com/wood/videoplayer/R$style.class
	new file:   bin/classes/com/wood/videoplayer/R.class
	new file:   bin/classes/com/wood/videoplayer/adapter/NativeListViewAdapter$Holder.class
	new file:   bin/classes/com/wood/videoplayer/adapter/NativeListViewAdapter.class
	new file:   bin/classes/com/wood/videoplayer/fileinfo/VideoInfo$1.class
	new file:   bin/classes/com/wood/videoplayer/fileinfo/VideoInfo.aidl
	new file:   bin/classes/com/wood/videoplayer/fileinfo/VideoInfo.class
	new file:   bin/classes/com/wood/videoplayer/tools/Tools.class
	new file:   bin/dexedLibs/android-support-v4-dfd2507a63ca1b4c1aa7c1b9dbf5c057.jar
	new file:   bin/jarlist.cache
	new file:   bin/res/crunch/drawable-hdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-hdpi/list_play_icon.png
	new file:   bin/res/crunch/drawable-hdpi/play_button.png
	new file:   bin/res/crunch/drawable-mdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-xhdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	new file:   bin/resources.ap_
	new file:   gen/com/wood/videoplayer/BuildConfig.java
	new file:   gen/com/wood/videoplayer/R.java
	new file:   ic_launcher-web.png
	new file:   libs/android-support-v4.jar
	new file:   proguard-project.txt
	new file:   project.properties
	new file:   res/drawable-hdpi/ic_launcher.png
	new file:   res/drawable-hdpi/list_play_icon.png
	new file:   res/drawable-hdpi/pause_button2.JPG
	new file:   res/drawable-hdpi/play_button.png
	new file:   res/drawable-mdpi/ic_launcher.png
	new file:   res/drawable-xhdpi/ic_launcher.png
	new file:   res/drawable-xxhdpi/ic_launcher.png
	new file:   res/layout/activity_main.xml
	new file:   res/layout/file_list.xml
	new file:   res/layout/list_item.xml
	new file:   res/layout/play.xml
	new file:   res/menu/main.xml
new file:   res/values-v11/styles.xml
	new file:   res/values-v14/styles.xml
	new file:   res/values-w820dp/dimens.xml
	new file:   res/values/dimens.xml
	new file:   res/values/strings.xml
	new file:   res/values/styles.xml
	new file:   src/com/wood/videoplayer/MainActivity.java
	new file:   src/com/wood/videoplayer/NativeFileFragment.java
	new file:   src/com/wood/videoplayer/NetFileFragment.java
	new file:   src/com/wood/videoplayer/PlayActivity.java
	new file:   src/com/wood/videoplayer/adapter/NativeListViewAdapter.java
	new file:   src/com/wood/videoplayer/fileinfo/VideoInfo.aidl
	new file:   src/com/wood/videoplayer/fileinfo/VideoInfo.java
	new file:   src/com/wood/videoplayer/tools/Tools.java
Merge branch 'master' of github.com:WoodJim/mediaPlayer