change workspace to gradlew
Merge branch 'master' of https://github.com/okamipride/MPlayerTest

Conflicts:
	src/com/example/mplayertest/MPlayerActivity.java