commit d95c93943e3a72f1d1ff7370ecd3b92c1b7300c5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 29 23:03:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 29 23:03:42 2016 +0000
tree 22cdf7717ee09ac1520b73d9ef11b923f4fb2973
parent f97ec6035305315cbaabaf1382e4cd20057e79c0
parent eb20671ab488cee85532788186344014b4e339e6

Merge "nfc: ALOGD redefinition warning"

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index d13a151..5cceb8a 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  ******************************************************************************/
+#include "OverrideLog.h"
 #include <android/hardware/nfc/1.0/INfc.h>
 #include <android/hardware/nfc/1.0/INfcClientCallback.h>
 #include <hwbinder/ProcessState.h>
 #include <pthread.h>
-#include "OverrideLog.h"
 #include "NfcAdaptation.h"
 extern "C"
 {