LifeCycleEvents_1
Merge branch 'master' of https://github.com/rayluu90/Android-Projects

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/GeoQuiz/org.ecli
pse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/HelloWorld/org.e
clipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/9.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.ec
lipse.adt.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.
ui.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1305520404.index
	.metadata/.plugins/org.eclipse.jdt.core/1891499709.index
	.metadata/.plugins/org.eclipse.jdt.core/2361940467.index
	.metadata/.plugins/org.eclipse.jdt.core/3249867875.index
	.metadata/.plugins/org.eclipse.jdt.core/3338748011.index
	.metadata/.plugins/org.eclipse.jdt.core/4124534550.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml