R 有冲突
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	gen/com/runyetech/find2/R.java