From: Jiang Jiang Jian <jack@espressif.com>
Date: Fri, 27 Apr 2018 04:01:46 +0000 (+0800)
Subject: Merge branch 'bugfix/btdm_modify_include_path' into 'master'
X-Git-Tag: v3.1-beta1~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc2d1fda964afb310c0ffa9b1bf9d2065b7121f2;p=esp-idf

Merge branch 'bugfix/btdm_modify_include_path' into 'master'

component/bt : modify header files to avoid conflict

See merge request idf/esp-idf!2195
---

cc2d1fda964afb310c0ffa9b1bf9d2065b7121f2