Merge branch 'master' into branch-1.9
[fw/altos] / altosdroid / app / src / main / java / org /
drwxr-xr-x   ..
drwxr-xr-x - altusmetrum