删除多余
Merge branch 'mirror' of
ssh://git@github.com/Regis25489/hellow-world.git into mirror

Conflicts:
	Game2/AndroidManifest.xml
	Game2/bin/AndroidManifest.xml
	Game2/res/values/styles.xml
aa
xx