a
Merge branch 'master' of git@github.com:wangyq/AuthBuptGw.git

Conflicts:
	AuthBuptGw/src/com/bnrc/authbuptgw/MainActivity.java
Merge branch 'master' of git@github.com:wangyq/AuthBuptGw.git
first work correct!
add
add
Merge branch 'master' of git@github.com:wangyq/AuthBuptGw.git

Conflicts:
	AuthBuptGw/src/com/bnrc/authbuptgw/MainActivity.java