nothing
Merge branch 'master' of https://github.com/quocdunginfo/workspace-android

Conflicts:
	qdCatPlayer/gen/com/qdcatplayer/main/R.java