binder: Clang format the source code
am: 44ad540b9c
Change-Id: Ib2444d840cd9f8d13ebe2c02bea096485f822fe2
diff --git a/wpa_supplicant/binder/binder_constants.h b/wpa_supplicant/binder/binder_constants.h
index 725ae37..a4d9b55 100644
--- a/wpa_supplicant/binder/binder_constants.h
+++ b/wpa_supplicant/binder/binder_constants.h
@@ -7,13 +7,8 @@
* See README for more details.
*/
-<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
#ifndef WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H
#define WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H
-=======
-#ifndef BINDER_CONSTANTS_H
-#define BINDER_CONSTANTS_H
->>>>>>> binder: Expose an aidl interface module
namespace wpa_supplicant_binder {
namespace binder_constants {
@@ -23,8 +18,4 @@
} /* namespace binder_constants */
} /* namespace wpa_supplicant_binder */
-<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
#endif /* WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H */
-=======
-#endif /* BINDER_CONSTANTS_H */
->>>>>>> binder: Expose an aidl interface module
diff --git a/wpa_supplicant/binder/binder_manager.cpp b/wpa_supplicant/binder/binder_manager.cpp
index 80cfcd2..27e8ded 100644
--- a/wpa_supplicant/binder/binder_manager.cpp
+++ b/wpa_supplicant/binder/binder_manager.cpp
@@ -21,11 +21,7 @@
BinderManager *BinderManager::instance_ = NULL;
-<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
BinderManager *BinderManager::getInstance()
-=======
-BinderManager * BinderManager::getInstance()
->>>>>>> binder: Expose an aidl interface module
{
if (!instance_)
instance_ = new BinderManager();
diff --git a/wpa_supplicant/binder/binder_manager.h b/wpa_supplicant/binder/binder_manager.h
index 872c13d..d8b7dd0 100644
--- a/wpa_supplicant/binder/binder_manager.h
+++ b/wpa_supplicant/binder/binder_manager.h
@@ -30,11 +30,7 @@
class BinderManager
{
public:
-<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
static BinderManager *getInstance();
-=======
- static BinderManager * getInstance();
->>>>>>> binder: Expose an aidl interface module
static void destroyInstance();
int registerBinderService(struct wpa_global *global);
int registerInterface(struct wpa_supplicant *wpa_s);