xx1212
Merge branch 'master' into xxxx

	EGithub/src/com/example/egithub/MainActivity.java