1.郭洋修复android社区bug
Merge branch 'master' into chenxy