liyu1
Merge branch 'master' of
https://github.com/liyureason/FragmentCallbackActivity.git

Conflicts:
	helloworld/src/com/example/helloworld/satiday.java