merge heads

This commit is contained in:
Jimmy Shih
2011-10-25 11:50:06 -07:00
parent b06201d079
commit f16f7b08c8
11 changed files with 15 additions and 22 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
# "ant.properties", and override values to adapt the script to your
# project structure.
android.library.reference.1=../MyTracksLib/
proguard.config=proguard.cfg
# Project target.
target=android-14
android.library.reference.1=../MyTracksLib