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

push
Merge pull request #24 from suntinghui/master

aas