Merge remote-tracking branch 'mjb/master'
[fw/altos] / altosdroid / res / values /
drwxr-xr-x   ..
-rw-r--r-- 2523 strings.xml