Merge branch 'master' into droid-gps
[fw/altos] / altosdroid / res / drawable / app_icon.png
altosdroid/res/drawable/app_icon.png