From: Jiang Jiang Jian <jack@espressif.com>
Date: Fri, 14 Apr 2017 04:12:24 +0000 (+0800)
Subject: Merge branch 'feature/btdm_sec_rebase_api' into 'master'
X-Git-Tag: v2.1-rc1~188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3026eda86a485068bfdf8003cce15a3c4ab5564a;p=esp-idf

Merge branch 'feature/btdm_sec_rebase_api' into 'master'

component/bt:move the btdm_rebase_ssp_api branch to this branch

remove the btdm_rebase_ssp_api branch & move it to this branch avoid the conflict with the maset

See merge request !667
---

3026eda86a485068bfdf8003cce15a3c4ab5564a