Merge branch 'branch-1.2' into debian
[fw/altos] / altosdroid / res / drawable / rocket.png
altosdroid/res/drawable/rocket.png