R变了  忽略他
Merge remote-tracking branch 'origin/master'

Conflicts:
	JianGuo_Git/gen/com/nut/activity/R.java