From: wangmengyang <wangmengyang@espressif.com>
Date: Fri, 2 Dec 2016 14:33:09 +0000 (+0800)
Subject: Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp
X-Git-Tag: v2.1-rc1~196^2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11ddfbba4e372e7821f02fd387123cb9290f5c8e;p=esp-idf

Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

# Conflicts:
#	examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
#	examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h
---

11ddfbba4e372e7821f02fd387123cb9290f5c8e