Commit inicial clase 12
Merge branch 'master' of https://github.com/cesclex/androidI

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

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.histo
ry/66/10c8c24ee54600131e8cb2258c9661e5

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.histo
ry/9d/c06b7f3ee54600131e8cb2258c9661e5

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/ActividadClase03/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/CalculatorSimple/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase01MiPrimerAndroid/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase02 Ciclo De Vida/.markers

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase02 Ciclo De Vida/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase04Mantenimiento/.indexes/a0/d6/properties.index

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase04Mantenimiento/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase05IMEIKEYS/.markers

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase05IMEIKEYS/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase06Checkboxes/.indexes/properties.index

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase06Checkboxes/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase07RadioButton/.indexes/properties.index

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase07RadioButton/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Clase08Spinner/org.eclipse.jdt.core/state.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.root/
13.tree

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.resources/.safet
able/org.eclipse.core.resources

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.core.runtime/.setting
s/com.android.ide.eclipse.adt.prefs

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.debug.ui/launchConfig
urationHistory.xml

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.e4.workbench/workbenc
h.xmi

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/202502486.in
dex

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/2346917615.i
ndex

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/3100139787.i
ndex

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/3111309331.i
ndex

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/528494542.in
dex

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/externalLibs
TimeStamps

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJ
arsCache

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNa
mes.txt

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.core/variablesAnd
Containers.dat

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeN
ameHistory.xml

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.jdt.ui/dialog_setting
s.xml

CAND/Modulo1Android/.metadata/.plugins/org.eclipse.ui.workbench/workings
ets.xml