merge heads

This commit is contained in:
Jimmy Shih
2012-04-03 13:02:35 -07:00
parent 4b8d4e92b8
commit 12f17e6f49
16 changed files with 87 additions and 54 deletions
-1
View File
@@ -3,7 +3,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.3.0-lite.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>