@android exit dialog
更新检查更新功能
Merge branch 'master' of http://192.168.1.146:8080/git/faeris
更改包名
更改包名
sss
@begin to support gps
Merge branch 'master' of http://192.168.1.146:8080/git/faeris
@fix b2draw
sssss
@add android net setting(10%)
Merge branch 'master' of http://192.168.1.146:8080/git/faeris

Conflicts:
	lib/libxAccess/proj.android/gen/com/huizhi/libpay/R.java

@update
@add net setting interface for android