ext

ext
merge

merge
Merge branch 'master' of https://github.com/kirkurg/AndroidApp

Conflicts:
	Android/.metadata/.log
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/d6/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/d6/properties.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/de/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/de/properties.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/29/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/b1/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/b8/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/f1/history.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/properties.index
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.markers
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.syncinfo.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/org.eclipse.jdt.core/state.dat
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/12.tree
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/9.tree
	Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Android/.metadata/.plugins/org.eclipse.jdt.core/1086477311.index
	Android/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Android/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Android/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	Android/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	Android/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Android/MusicApp/bin/MusicApp.apk
	Android/MusicApp/bin/classes.dex
	Android/MusicApp/bin/classes/Activity/Style_activity.class
	Android/MusicApp/bin/classes/Adapter/ListAdapter.class
	Android/MusicApp/bin/classes/adapter/SpinnerAdapter.class
	Android/MusicApp/bin/classes/dialog/dialog_style$1.class
	Android/MusicApp/bin/classes/dialog/dialog_style$2.class
	Android/MusicApp/bin/classes/dialog/dialog_style.class
	Android/MusicApp/bin/classes/main/musicapp/R$drawable.class
	Android/MusicApp/bin/classes/main/musicapp/R$id.class
	Android/MusicApp/bin/classes/main/musicapp/R$layout.class
	Android/MusicApp/bin/classes/main/musicapp/R$menu.class
	Android/MusicApp/bin/classes/main/musicapp/R$string.class
	Android/MusicApp/bin/classes/main/musicapp/R$style.class
	Android/MusicApp/bin/resources.ap_
	Android/MusicApp/gen/main/musicapp/R.java
	Android/MusicApp/src/Adapter/ListAdapter.java
Merge branch 'master' of https://github.com/kirkurg/AndroidApp

Conflicts:
	Android/.metadata/.log

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/d6/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/d6/properties.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/de/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/a0/de/properties.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/29/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/b1/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/b8/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/e4/f1/history.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.indexes/properties.index

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.markers

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.markers.snap

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/.syncinfo.snap

	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/MusicApp/org.eclipse.jdt.core/state.dat

	Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/12.tree
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/9.tree

	Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources

	Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Android/.metadata/.plugins/org.eclipse.jdt.core/1086477311.index
	Android/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

	Android/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Android/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml

	Android/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml

	Android/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	Android/MusicApp/bin/MusicApp.apk
	Android/MusicApp/bin/classes.dex
	Android/MusicApp/bin/classes/Activity/Style_activity.class
	Android/MusicApp/bin/classes/Adapter/ListAdapter.class
	Android/MusicApp/bin/classes/adapter/SpinnerAdapter.class
	Android/MusicApp/bin/classes/dialog/dialog_style$1.class
	Android/MusicApp/bin/classes/dialog/dialog_style$2.class
	Android/MusicApp/bin/classes/dialog/dialog_style.class
	Android/MusicApp/bin/classes/main/musicapp/R$drawable.class
	Android/MusicApp/bin/classes/main/musicapp/R$id.class
	Android/MusicApp/bin/classes/main/musicapp/R$layout.class
	Android/MusicApp/bin/classes/main/musicapp/R$menu.class
	Android/MusicApp/bin/classes/main/musicapp/R$string.class
	Android/MusicApp/bin/classes/main/musicapp/R$style.class
	Android/MusicApp/bin/resources.ap_
	Android/MusicApp/gen/main/musicapp/R.java
	Android/MusicApp/src/Adapter/ListAdapter.java