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

LJ
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git
dd
Merge pull request #50 from liaojia/master

jia