button3
Merge remote-tracking branch 'origin/hxg'

Conflicts:
	ApiDemosGithub/bin/classes/com/example/apidemosgithub/MainActivity.class
	ApiDemosGithub/bin/classes/com/example/apidemosgithub/R$id.class
	ApiDemosGithub/gen/com/example/apidemosgithub/R.java
	ApiDemosGithub/res/layout/activity_main.xml