Merge "Allow mkdir() race to succeed." into jb-mr1-dev
diff --git a/libcutils/fs.c b/libcutils/fs.c
index a9889b2..1226d44 100644
--- a/libcutils/fs.c
+++ b/libcutils/fs.c
@@ -55,8 +55,10 @@
 
 create:
     if (TEMP_FAILURE_RETRY(mkdir(path, mode)) == -1) {
-        ALOGE("Failed to mkdir(%s): %s", path, strerror(errno));
-        return -1;
+        if (errno != EEXIST) {
+            ALOGE("Failed to mkdir(%s): %s", path, strerror(errno));
+            return -1;
+        }
     }
 
 fixup: