new branch
hxg branch
Activity2
add text
manifest
clean
Merge remote-tracking branch 'origin/hxg'

Conflicts:
	ApiDemosGithub/AndroidManifest.xml
	ApiDemosGithub/bin/AndroidManifest.xml
	ApiDemosGithub/res/layout/activity_main.xml
	ApiDemosGithub/src/com/example/apidemosgithub/MainActivity.java