Merge with 28a6c6c0e8f12e489fa501609be4b564eb822f55

(Merge to Head)
2010-09-02 12:23:32 +01:00
parent 236bcba2bd
commit b84da40365
57 changed files with 4662 additions and 2465 deletions
@@ -4,6 +4,11 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/easymock.jar"/>
+	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
+	<classpathentry kind="src" path=".apt_generated">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>