rm launch_icon
Merge branch 'master' of https://github.com/thannous/sante
Activity Info

Signed-off-by: Amaury Larreur <amaury.larreur@gmail.com>
Merge branch 'master' of https://github.com/thannous/sante

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml