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
-2
View File
@@ -10,7 +10,5 @@
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
<classpathentry kind="lib" path="/MyTracks/libs/google-common.jar"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
-1
View File
@@ -11,4 +11,3 @@
split.density=false
# Project target.
target=Google Inc.:Google APIs:14
android.library.reference.1=../MyTracksLib