STH
STH
STH
STH
Merge branch 'master' of github.com:suntinghui/LKOA4Android
Merge pull request #47 from liaojia/master

pull
STH
Merge branch 'master' of git@github.com:suntinghui/LKOA4Android.git
Merge pull request #33 from suntinghui/master

pull