Merge branch 'master' into branch-1.9
[fw/altos] / icon / altosdroid.png
icon/altosdroid.png