commit d67cc366f769a84f56755b12d2c943113ec46f8c
author Robert Greenwalt <rgreenwalt@google.com> Mon Jan 14 11:46:38 2013 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Mon Jan 14 11:46:38 2013 -0800
tree 37c86da3588552d23f3a8678e9e6bcb2b541c583
parent e0644327ffb203e0b45f3192fd888831902e267c
parent b40c2385c7ef44fa0f2369a5378b539dc29c2779

resolved conflicts for merge of b40c2385 to jb-mr1.1-dev

Change-Id: I0cef2141487ffd2cb5694a10e4077c299d9d7df7

SoftapController.cpp

diff --git a/SoftapController.cpp b/SoftapController.cpp
index 5db8742..7c7b2d0 100644
--- a/SoftapController.cpp
+++ b/SoftapController.cpp
@@ -169,7 +169,7 @@
         asprintf(&fbuf, "%s", wbuf);
     }
 
-    fd = open(HOSTAPD_CONF_FILE, O_CREAT | O_TRUNC | O_WRONLY | O_NOFOLLOW , 0660);
+    fd = open(HOSTAPD_CONF_FILE, O_CREAT | O_TRUNC | O_WRONLY | O_NOFOLLOW, 0660);
     if (fd < 0) {
         ALOGE("Cannot update \"%s\": %s", HOSTAPD_CONF_FILE, strerror(errno));
         free(wbuf);