musiclist data trans
Merge branch 'master' of github.com:zhouzhaoping/iMap

Conflicts:
	src/com/example/imap/MainActivity.java