am 264d42dd: Merge change Idf5bcb58 into eclair

Merge commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900' into eclair-mr2

* commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900':
  Fix ant install when -Dadb.device.arg not provided.

tools/scripts/android_rules.xml

@@ -182,7 +182,7 @@
         <sequential>
             <echo>Installing ${out.debug.package} onto default emulator or device...</echo>
             <exec executable="${adb}" failonerror="true">
-                <arg value="${adb.device.arg}" />
+                <arg line="${adb.device.arg}" />
                 <arg value="install" />
                 <arg value="-r" />
                 <arg path="${out.debug.package}" />
@@ -366,6 +366,7 @@
                 description="Uninstalls the application from a running emulator or device.">
         <echo>Uninstalling ${manifest.package} from the default emulator or device...</echo>
         <exec executable="${adb}" failonerror="true">
+            <arg line="${adb.device.arg}" />
             <arg value="uninstall" />
             <arg value="${manifest.package}" />
         </exec>