auto import from //branches/cupcake/...@131421
diff --git a/vold/ums.c b/vold/ums.c
index 2686b6f..4d0fc25 100644
--- a/vold/ums.c
+++ b/vold/ums.c
@@ -45,7 +45,7 @@
 void ums_hostconnected_set(boolean connected)
 {
 #if DEBUG_UMS
-    LOG_VOL("ums_hostconnected_set(%d):\n", connected);
+    LOG_VOL("ums_hostconnected_set(%d):", connected);
 #endif
     host_connected = connected;
 
@@ -56,19 +56,19 @@
 
 int ums_enable(char *dev_fspath, char *lun_syspath)
 {
-    LOG_VOL("ums_enable(%s, %s):\n", dev_fspath, lun_syspath);
+    LOG_VOL("ums_enable(%s, %s):", dev_fspath, lun_syspath);
 
     int fd;
     char filename[255];
 
     sprintf(filename, "/sys/%s/file", lun_syspath);
     if ((fd = open(filename, O_WRONLY)) < 0) {
-        LOGE("Unable to open '%s' (%s)\n", filename, strerror(errno));
+        LOGE("Unable to open '%s' (%s)", filename, strerror(errno));
         return -errno;
     }
 
     if (write(fd, dev_fspath, strlen(dev_fspath)) < 0) {
-        LOGE("Unable to write to ums lunfile (%s)\n", strerror(errno));
+        LOGE("Unable to write to ums lunfile (%s)", strerror(errno));
         close(fd);
         return -errno;
     }
@@ -80,7 +80,7 @@
 int ums_disable(char *lun_syspath)
 {
 #if DEBUG_UMS
-    LOG_VOL("ums_disable(%s):\n", lun_syspath);
+    LOG_VOL("ums_disable(%s):", lun_syspath);
 #endif
 
     int fd;
@@ -88,14 +88,14 @@
 
     sprintf(filename, "/sys/%s/file", lun_syspath);
     if ((fd = open(filename, O_WRONLY)) < 0) {
-        LOGE("Unable to open '%s' (%s)\n", filename, strerror(errno));
+        LOGE("Unable to open '%s' (%s)", filename, strerror(errno));
         return -errno;
     }
 
     char ch = 0;
 
     if (write(fd, &ch, 1) < 0) {
-        LOGE("Unable to write to ums lunfile (%s)\n", strerror(errno));
+        LOGE("Unable to write to ums lunfile (%s)", strerror(errno));
         close(fd);
         return -errno;
     }
@@ -114,7 +114,7 @@
     int rc;
 
 #if DEBUG_UMS
-    LOG_VOL("ums_send_status():\n");
+    LOG_VOL("ums_send_status():");
 #endif
 
     rc = send_msg(ums_enabled_get() ? VOLD_EVT_UMS_ENABLED :