commit 8a4b028f72a21a87268920de17b47a825fe8d959
author Jeff Sharkey <jsharkey@android.com> Tue Sep 09 22:16:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 09 22:16:01 2014 +0000
tree 9eaa97885fcd9213410a7cffd23a6bb3b9869b13
parent 17c779c154f3938cacb8e29290d2cd86f3db7469
parent 84e533d7b06de2dfd2a40b577ef22877e0e499af

am 84e533d7: am 228f8261: Merge "delete_file() should force removal." into lmp-dev

* commit '84e533d7b06de2dfd2a40b577ef22877e0e499af':
  delete_file() should force removal.

adb/commandline.c

diff --git a/adb/commandline.c b/adb/commandline.c
index b268ca5..51c039e 100644
--- a/adb/commandline.c
+++ b/adb/commandline.c
@@ -1870,7 +1870,7 @@
     char buf[4096];
     char* quoted;
 
-    snprintf(buf, sizeof(buf), "shell:rm ");
+    snprintf(buf, sizeof(buf), "shell:rm -f ");
     quoted = escape_arg(filename);
     strncat(buf, quoted, sizeof(buf)-1);
     free(quoted);