LJJ
Merge branch 'master' of github.com:liaojia/LKOA4Android