Edited android settings
Merge branch 'master' of https://github.com/siketh/COP4331_Project