Signed-off-by: xmuzhangshuai <1207509737@qq.com>
Signed-off-by: xmuzhangshuai <1207509737@qq.com>
Merge branch 'master' of
ssh://git@github.com/xmuzhangshuai/ExamHelperClient.git

Conflicts:
	ExamHelper/bin/ExamHelper.apk
	ExamHelper/bin/classes.dex
	ExamHelper/bin/resources.ap_
	library/bin/library.jar
Signed-off-by: xmuzhangshuai <1207509737@qq.com>