James Cotton 69328edd0d Merge branch 'android' into revo-mini ...

Conflicts:
	androidgcs/AndroidManifest.xml
	androidgcs/res/layout/gcs_home.xml
	androidgcs/res/values/strings.xml
	androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
	androidgcs/src/org/openpilot/androidgcs/HomePage.java

2012-08-30 12:10:12 -05:00

..

hdpi

Merge branch 'android' into revo-mini

2012-08-30 12:10:12 -05:00