Merge remote-tracking branch 'mjb/master'
[fw/altos] / altosdroid / .gitignore
1 local.properties
2 bin
3 gen