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