LifeCycleEvents_4
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/.projects/LifeCycleEvents/
.indexes/e4/b6/73/70/3/history.index

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

.metadata/.plugins/org.eclipse.core.resources/.projects/LifeCycleEvents/
.markers

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

.metadata/.plugins/org.eclipse.core.resources/.projects/TestClasses/.mar
kers

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

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

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

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1563927245.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