commit 80f7a7386d496624c3144cd6ef6881ac9ef776ed
author Justin Yun <justinyun@google.com> Wed Apr 04 11:39:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 04 11:39:38 2018 -0700
tree 09dbc7e1eef4eb75f5009371be9b3082b8adca1e
parent f5ff1e139e718d9c76edc2d8a11807936778ad97
parent 116b6cef23521745f86b21633f6e0e865782fda6

resolve merge conflicts of 594542257a0f89bd1737a1dec71e0551ebb4d5af to pi-dev-plus-aosp
am: 116b6cef23

Change-Id: Idfeb1f4fd81c578d574830ca591572463e41dd79

src/eap_peer/eap_proxy_qmi_oc.c

diff --git a/src/eap_peer/eap_proxy_qmi_oc.c b/src/eap_peer/eap_proxy_qmi_oc.c
index 4c07da5..9fcf512 100644
--- a/src/eap_peer/eap_proxy_qmi_oc.c
+++ b/src/eap_peer/eap_proxy_qmi_oc.c
@@ -32,7 +32,7 @@
 
 #ifdef CONFIG_EAP_PROXY
 #include "qmi_client.h"
-#include "eap_proxy_qmi.h"
+#include "eap_proxy_qmi_oc.h"
 #include "qmi_client.h"
 #include "qmi_idl_lib.h"
 #include "authentication_service_v01.h"