From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 28 Dec 2017 14:07:27 +0000 (+0800)
Subject: Merge branch 'cherry-pick-7d0d2854' into 'release/v3.0'
X-Git-Tag: v3.0~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=755b163d4e1cd2c3301ed4e82e62720a20561bd3;p=esp-idf

Merge branch 'cherry-pick-7d0d2854' into 'release/v3.0'

Merge branch 'bugfix/btdm_error_when_white_list_is_full' into 'master'

See merge request !1715
---

755b163d4e1cd2c3301ed4e82e62720a20561bd3