忽略R.java文件的修改

gen/org/hekangping/easypic/R.java
gen/android/support/v7/appcompat/R.java
Merge branch 'master' of https://github.com/runningletters/easyPic

Conflicts:
	gen/org/hekangping/easypic/R.java