merge heads

This commit is contained in:
Jimmy Shih
2011-10-21 16:16:01 -07:00
parent 1068b64b74
commit 66f41ca1ae
32 changed files with 970 additions and 230 deletions
+2 -1
View File
@@ -5,5 +5,6 @@
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>