format code
Merge branch 'master' of https://github.com/kai-wang-john/android-base
Merge branch 'master' of https://github.com/kai-wang-john/android-base