主干加1
Merge branch 'master' of https://github.com/alvin87/MyFragmentsDemo.git

Conflicts:
	src/com/my/fragments/a.java