Merge remote-tracking branch 'mjb/android-build-update'
[fw/altos] / altosdroid / app / src / main / res / drawable / pad.png
altosdroid/app/src/main/res/drawable/pad.png