From: Jiang Jiang Jian <jack@espressif.com>
Date: Wed, 13 Sep 2017 03:50:57 +0000 (+0800)
Subject: Merge branch 'feature/adv_scan_simultaneously' into 'master'
X-Git-Tag: v3.1-dev~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1e3b0df022451ec2b87669292f1016ad38d0346;p=esp-idf

Merge branch 'feature/adv_scan_simultaneously' into 'master'

component/bt : support adv & scan simultaneously

See merge request !1209
---

f1e3b0df022451ec2b87669292f1016ad38d0346