commit 2908ff6dbf0e62df942bc455098f2999889d2aa8
author Ted Wang <tedwang@google.com> Mon Nov 25 19:30:33 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 25 19:30:33 2019 -0800
tree 708d295be5decc6e9aeaa635655ce0f8ae8209ff
parent 5d4202868436b9a9443ed52919e448c4cdea97f3
parent 9e976434fe9b8b9ca42371b0ba865d4c69c9137f

Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am: aa754ed3ec am: 53afb387a4 am: a651e35ad0 am: 91f38752fa am: 9d7aa50fb7
am: 9e976434fe

Change-Id: I62a7aefbeaeb699b21daf88ccd16b1d72f3c0438

stack/btm/btm_acl.cc

diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index d7e043d..be0c937 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -50,7 +50,6 @@
 #include "device/include/interop.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"
-#include "log/log.h"
 #include "l2c_int.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"