android setting finish
Merge branch 'master' of https://github.com/TridentGameDev/pillow