James Cotton 5ec44d3407 Merge branch 'android_osg' into android_revo ... Conflicts: androidgcs/AndroidManifest.xml androidgcs/res/layout/gcs_home.xml androidgcs/res/values/strings.xml androidgcs/src/org/openpilot/androidgcs/HomePage.java		2012-08-24 20:26:04 -05:00
..
arrays.xml	AndroidGCS: Add support for HID to AndroidGCS	2012-08-16 03:43:10 -05:00
colors.xml	Added a simple PFD	2012-08-06 16:54:53 -05:00
strings.xml	Merge branch 'android_osg' into android_revo	2012-08-24 20:26:04 -05:00