merge heads

2011-10-21 13:50:19 -07:00
commit 8326d37806
498 changed files with 62862 additions and 0 deletions
@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-10
+android.library.reference.1=../MyTracksLib