gg

ggg
Merge branch 'master' of https://github.com/godiciel/GitPlatforms

Conflicts:

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

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

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

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

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

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

Android/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/pro
perties.index

Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.sna
p

Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.ecl
ipse.core.resources
	Android/.metadata/.plugins/org.eclipse.core.resources/.snap

Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclips
e.ui.workbench.prefs
	Android/.metadata/.plugins/org.eclipse.jdt.core/4000093359.index
	Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
eeee

eee