Restore Google Guava - oauth has a dependency on it that wasn't caught previously

astrid/.classpath

@@ -29,5 +29,6 @@
 	<classpathentry kind="lib" path="libs/crittercism_v1_2_5.jar"/>
 	<classpathentry kind="lib" path="libs/jchronic-0.2.3.jar"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/guava-11.0.1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

astrid/build.xml

@@ -54,7 +54,7 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
-    <target name="-pre-build" depends="get-version, copy-sources, updatekeys, updatekeys-release, disable-market">
+    <target name="-pre-build" depends="clean, get-version, copy-sources, updatekeys, updatekeys-release, disable-market">
       <mkdir dir="gen" />
     </target>
 

astrid/proguard.cfg

@@ -10,6 +10,7 @@
 -keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable
 -keep, allowshrinking, allowoptimization class com.todoroo.**
 -keep class com.mdimension.**
+-keep class com.google.common.base.**
 
 # ignore reflection-based access from google libraries
 -dontwarn com.google.**