b
f
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	bin/classes.dex
	bin/classes/cn/wang/yin/utils/CollectGpsUtil$1.class
	bin/classes/cn/wang/yin/utils/CollectGpsUtil.class
	bin/personal.apk
可以定位了