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
@@ -9,4 +9,3 @@
# Project target.
target=android-14
android.library.reference.1=../MyTracksLib