saxaphone
Merge branch 'origin/master'

Conflicts:
	SaxaphoneDemo/.classpath
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/AnimationCls.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/BuildConfig.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/MainActivity.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/Notes.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$anim.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$attr.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$drawable.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$id.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$layout.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$menu.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$string.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$style.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/SoundPlayer.class
	SaxaphoneDemo/bin/jarlist.cache
	SaxaphoneDemo/gen/tvs/saxaphonedemo/R.java
	SaxaphoneDemo/src/tvs/saxaphonedemo/MainActivity.java
Merge branch 'origin/master'

Conflicts:
	SaxaphoneDemo/.classpath
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/AnimationCls.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/BuildConfig.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/MainActivity.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/Notes.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$anim.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$attr.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$drawable.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$id.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$layout.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$menu.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$string.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R$style.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/R.class
	SaxaphoneDemo/bin/classes/tvs/saxaphonedemo/SoundPlayer.class
	SaxaphoneDemo/bin/jarlist.cache
	SaxaphoneDemo/gen/tvs/saxaphonedemo/R.java
	SaxaphoneDemo/src/tvs/saxaphonedemo/MainActivity.java