diff --git a/clients/android/assets/camput.arm.oldworks b/clients/android/assets/camput.arm.oldworks
new file mode 100755
index 000000000..810fbdcef
Binary files /dev/null and b/clients/android/assets/camput.arm.oldworks differ
diff --git a/clients/android/src/org/camlistore/CamliActivity.java b/clients/android/src/org/camlistore/CamliActivity.java
index e506991f2..61bf173ad 100644
--- a/clients/android/src/org/camlistore/CamliActivity.java
+++ b/clients/android/src/org/camlistore/CamliActivity.java
@@ -26,6 +26,8 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
+import android.os.MessageQueue;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Menu;
@@ -48,8 +50,26 @@ public class CamliActivity extends Activity {
     private IUploadService mServiceStub = null;
     private IStatusCallback mCallback = null;
 
+    // Status text update state, since it updates too quickly to do it the naive way.
+    private long mLastStatusUpdate = 0; // time in millis we lasted updated the screen
+    private String mStatusTextCurrent = null; // what the screen says
+    private String mStatusTextWant = null; // what the service wants it to say
+
     private final Handler mHandler = new Handler();
 
+    private final MessageQueue.IdleHandler mIdleHandler = new MessageQueue.IdleHandler() {
+        @Override
+        public boolean queueIdle() {
+            if (mStatusTextCurrent != mStatusTextWant) {
+                TextView textStats = (TextView) findViewById(R.id.textStats);
+                mLastStatusUpdate = System.currentTimeMillis();
+                mStatusTextCurrent = mStatusTextWant;
+                textStats.setText(mStatusTextWant);
+            }
+            return true;
+        }
+    };
+
     private final ServiceConnection mServiceConnection = new ServiceConnection() {
 
         @Override
@@ -76,6 +96,7 @@ public class CamliActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
+        Looper.myQueue().addIdleHandler(mIdleHandler);
         final Button buttonToggle = (Button) findViewById(R.id.buttonToggle);
 
         final TextView textStatus = (TextView) findViewById(R.id.textStatus);
@@ -181,10 +202,20 @@ public class CamliActivity extends Activity {
 
             @Override
             public void setUploadStatsText(final String text) throws RemoteException {
+                // We were getting these status updates so quickly that the calls to TextView.setText
+                // were consuming all CPU on the main thread and it was stalling the main thread
+                // for seconds. Ridiculous. So instead, only update this every 5 milliseconds,
+                // otherwise wait for the looper to be idle to update it.
                 mHandler.post(new Runnable() {
                     @Override
                     public void run() {
-                        textStats.setText(text);
+                        mStatusTextWant = text;
+                        long now = System.currentTimeMillis();
+                        if (mLastStatusUpdate < now - 5) {
+                            mStatusTextCurrent = mStatusTextWant;
+                            textStats.setText(mStatusTextWant);
+                            mLastStatusUpdate = System.currentTimeMillis();
+                        }
                     }
                 });
             }
@@ -286,7 +317,7 @@ public class CamliActivity extends Activity {
         } catch (NumberFormatException enf) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setMessage("Server should be of form [https://]<host[:port]>")
-                .setTitle("Invalid Setting");
+                    .setTitle("Invalid Setting");
             AlertDialog alert = builder.create();
             alert.show();
         }
diff --git a/clients/android/src/org/camlistore/UploadService.java b/clients/android/src/org/camlistore/UploadService.java
index e49912da1..815e1a5b6 100644
--- a/clients/android/src/org/camlistore/UploadService.java
+++ b/clients/android/src/org/camlistore/UploadService.java
@@ -240,14 +240,11 @@ public class UploadService extends Service {
                     for (String dirName : dirs) {
                         File dir = new File(dirName);
                         if (!dir.exists()) {
-                            Log.d(TAG, "Skipping non-existent directory " + dirName);
                             continue;
                         }
                         File[] files = dir.listFiles();
-                        Log.d(TAG, "Contents of " + dirName + ": " + files);
                         if (files != null) {
                             for (int i = 0; i < files.length; ++i) {
-                                Log.d(TAG, "  " + files[i]);
                                 File f = files[i];
                                 if (f.isDirectory()) {
                                     // Skip thumbnails directory.
diff --git a/clients/android/test/.classpath b/clients/android/test/.classpath
index 32f115a89..b9866f21c 100644
--- a/clients/android/test/.classpath
+++ b/clients/android/test/.classpath
@@ -4,5 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/camlistore"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>