Merge branch 'master' into altosdroid
[fw/altos] / altosdroid / res / layout / device_list.xml
2012-06-03 Keith Packardaltosdroid: import code from mjb