测试另外一人删除之后,我这边做修改
测试合并主干1
测试主干2
测试主干3
测试主干4
测试主干5
Merge remote-tracking branch 'origin/master'

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