Android 修正
Merge branch 'master' of https://github.com/itouchan/bronze