diff --git a/clients/android/uploader/.classpath b/clients/android/uploader/.classpath
new file mode 100644
index 000000000..609aa00eb
--- /dev/null
+++ b/clients/android/uploader/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/clients/android/uploader/.gitignore b/clients/android/uploader/.gitignore
new file mode 100644
index 000000000..48dba237c
--- /dev/null
+++ b/clients/android/uploader/.gitignore
@@ -0,0 +1,8 @@
+build
+gen
+bin
+local.properties
+test/local.properties
+test/build
+test/gen
+test/bin
diff --git a/clients/android/uploader/.project b/clients/android/uploader/.project
new file mode 100644
index 000000000..71acf2ffd
--- /dev/null
+++ b/clients/android/uploader/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>camlistore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/clients/android/uploader/.settings/org.eclipse.jdt.core.prefs b/clients/android/uploader/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..2d48bc7d5
--- /dev/null
+++ b/clients/android/uploader/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Sun Jul 18 21:20:12 PDT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/clients/android/uploader/AndroidManifest.xml b/clients/android/uploader/AndroidManifest.xml
new file mode 100644
index 000000000..c28be1725
--- /dev/null
+++ b/clients/android/uploader/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.danga.camli"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
+        <activity android:name=".CamliActivity"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+
+</manifest> 
\ No newline at end of file
diff --git a/clients/android/uploader/build.properties b/clients/android/uploader/build.properties
new file mode 100644
index 000000000..4ccf4d1cc
--- /dev/null
+++ b/clients/android/uploader/build.properties
@@ -0,0 +1,2 @@
+out.dir=build
+gen.dir=build/gen
diff --git a/clients/android/uploader/build.xml b/clients/android/uploader/build.xml
new file mode 100644
index 000000000..a7d0e9481
--- /dev/null
+++ b/clients/android/uploader/build.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="CamliActivity" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked in in Version
+         Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the default property values
+         used by the Ant rules.
+         Here are some properties you may want to change/update:
+
+         application.package
+             the name of your application package as defined in the manifest. Used by the
+             'uninstall' rule.
+         source.dir
+             the name of the source directory. Default is 'src'.
+         out.dir
+             the name of the output directory. Default is 'bin'.
+
+         Properties related to the SDK location or the project target should be updated
+          using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems.
+
+         -->
+    <property file="build.properties" />
+
+    <!-- The default.properties file is created and updated by the 'android' tool, as well
+         as ADT.
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems. -->
+    <property file="default.properties" />
+
+    <!-- Custom Android task to deal with the project target, and import the proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+    </path>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+         and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+         To customize some build steps for your project:
+         - copy the content of the main node <project> from android_rules.xml
+         - paste it in this build.xml below the <setup /> task.
+         - disable the import by changing the setup task below to <setup import="false" />
+
+         This will ensure that the properties are setup correctly but that your customized
+         build steps are used.
+    -->
+    <setup />
+
+</project>
diff --git a/clients/android/uploader/default.properties b/clients/android/uploader/default.properties
new file mode 100644
index 000000000..9d79b12c7
--- /dev/null
+++ b/clients/android/uploader/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-4
diff --git a/clients/android/uploader/res/drawable-hdpi/icon.png b/clients/android/uploader/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..8074c4c57
Binary files /dev/null and b/clients/android/uploader/res/drawable-hdpi/icon.png differ
diff --git a/clients/android/uploader/res/drawable-ldpi/icon.png b/clients/android/uploader/res/drawable-ldpi/icon.png
new file mode 100644
index 000000000..1095584ec
Binary files /dev/null and b/clients/android/uploader/res/drawable-ldpi/icon.png differ
diff --git a/clients/android/uploader/res/drawable-mdpi/icon.png b/clients/android/uploader/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000..a07c69fa5
Binary files /dev/null and b/clients/android/uploader/res/drawable-mdpi/icon.png differ
diff --git a/clients/android/uploader/res/layout/main.xml b/clients/android/uploader/res/layout/main.xml
new file mode 100644
index 000000000..3a5f117d3
--- /dev/null
+++ b/clients/android/uploader/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/clients/android/uploader/res/values/strings.xml b/clients/android/uploader/res/values/strings.xml
new file mode 100644
index 000000000..7b32b937e
--- /dev/null
+++ b/clients/android/uploader/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, CamliActivity!</string>
+    <string name="app_name">CamliActivity</string>
+</resources>
diff --git a/clients/android/uploader/src/com/danga/camli/CamliActivity.java b/clients/android/uploader/src/com/danga/camli/CamliActivity.java
new file mode 100644
index 000000000..c21738818
--- /dev/null
+++ b/clients/android/uploader/src/com/danga/camli/CamliActivity.java
@@ -0,0 +1,13 @@
+package com.danga.camli;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class CamliActivity extends Activity {
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+}
\ No newline at end of file
diff --git a/clients/android/uploader/test/.classpath b/clients/android/uploader/test/.classpath
new file mode 100644
index 000000000..1fbaa9b51
--- /dev/null
+++ b/clients/android/uploader/test/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/camlistore"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/clients/android/uploader/test/.project b/clients/android/uploader/test/.project
new file mode 100644
index 000000000..8b5201a4a
--- /dev/null
+++ b/clients/android/uploader/test/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>camlistoreTest</name>
+	<comment></comment>
+	<projects>
+		<project>camlistore</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/clients/android/uploader/test/AndroidManifest.xml b/clients/android/uploader/test/AndroidManifest.xml
new file mode 100644
index 000000000..11f303877
--- /dev/null
+++ b/clients/android/uploader/test/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.danga.camli.test"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
+
+    <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:targetPackage="com.danga.camli" android:name="android.test.InstrumentationTestRunner" />
+</manifest> 
\ No newline at end of file
diff --git a/clients/android/uploader/test/build.properties b/clients/android/uploader/test/build.properties
new file mode 100644
index 000000000..d1189eee6
--- /dev/null
+++ b/clients/android/uploader/test/build.properties
@@ -0,0 +1,21 @@
+# This file is used to override default values used by the Ant build system.
+# 
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+tested.project.dir=..
+
+out.dir=build
+gen.dir=build/gen
diff --git a/clients/android/uploader/test/build.xml b/clients/android/uploader/test/build.xml
new file mode 100644
index 000000000..749e60b41
--- /dev/null
+++ b/clients/android/uploader/test/build.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="CamliActivityTest" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked in in Version
+         Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the default property values
+         used by the Ant rules.
+         Here are some properties you may want to change/update:
+
+         application.package
+             the name of your application package as defined in the manifest. Used by the
+             'uninstall' rule.
+         source.dir
+             the name of the source directory. Default is 'src'.
+         out.dir
+             the name of the output directory. Default is 'bin'.
+
+         Properties related to the SDK location or the project target should be updated
+          using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems.
+
+         -->
+    <property file="build.properties" />
+
+    <!-- The default.properties file is created and updated by the 'android' tool, as well
+         as ADT.
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems. -->
+    <property file="default.properties" />
+
+    <!-- Custom Android task to deal with the project target, and import the proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+    </path>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+         and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+         To customize some build steps for your project:
+         - copy the content of the main node <project> from android_rules.xml
+         - paste it in this build.xml below the <setup /> task.
+         - disable the import by changing the setup task below to <setup import="false" />
+
+         This will ensure that the properties are setup correctly but that your customized
+         build steps are used.
+    -->
+    <setup />
+    
+    <!-- See:
+       http://www.alittlemadness.com/2010/05/31/setting-up-an-android-project-build/
+          and:
+       http://code.google.com/p/android/issues/detail?id=8001
+      -->
+    <property name="extensible.classpath" value="${tested.project.absolute.dir}/${out.dir}/classes"/>
+</project>
diff --git a/clients/android/uploader/test/default.properties b/clients/android/uploader/test/default.properties
new file mode 100644
index 000000000..9d79b12c7
--- /dev/null
+++ b/clients/android/uploader/test/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-4
diff --git a/clients/android/uploader/test/res/drawable-hdpi/icon.png b/clients/android/uploader/test/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..8074c4c57
Binary files /dev/null and b/clients/android/uploader/test/res/drawable-hdpi/icon.png differ
diff --git a/clients/android/uploader/test/res/drawable-ldpi/icon.png b/clients/android/uploader/test/res/drawable-ldpi/icon.png
new file mode 100644
index 000000000..1095584ec
Binary files /dev/null and b/clients/android/uploader/test/res/drawable-ldpi/icon.png differ
diff --git a/clients/android/uploader/test/res/drawable-mdpi/icon.png b/clients/android/uploader/test/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000..a07c69fa5
Binary files /dev/null and b/clients/android/uploader/test/res/drawable-mdpi/icon.png differ
diff --git a/clients/android/uploader/test/res/layout/main.xml b/clients/android/uploader/test/res/layout/main.xml
new file mode 100644
index 000000000..3a5f117d3
--- /dev/null
+++ b/clients/android/uploader/test/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/clients/android/uploader/test/res/values/strings.xml b/clients/android/uploader/test/res/values/strings.xml
new file mode 100644
index 000000000..45c922e38
--- /dev/null
+++ b/clients/android/uploader/test/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World!</string>
+    <string name="app_name">camlistoreTest</string>
+</resources>
diff --git a/clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java b/clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java
new file mode 100644
index 000000000..c0086f300
--- /dev/null
+++ b/clients/android/uploader/test/src/com/danga/camli/CamliActivityTest.java
@@ -0,0 +1,16 @@
+package com.danga.camli;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class CamliActivityTest extends ActivityInstrumentationTestCase2<CamliActivity> {
+	
+	public CamliActivityTest(String pkg, Class<CamliActivity> activityClass) {
+		super(pkg, activityClass);
+		// TODO Auto-generated constructor stub
+	}
+
+	public void testSanity() {
+		assertEquals(2, 1 + 1);
+		assertEquals(4, 2 + 2);
+	}
+}