From: Jiang Jiang Jian <jack@espressif.com>
Date: Wed, 11 Apr 2018 12:48:13 +0000 (+0800)
Subject: Merge branch 'feature/btdm_add_set_local_icon_api' into 'master'
X-Git-Tag: v3.1-beta1~271
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12dbe4dac5ccca0708667b97b07e8c75365ae3e1;p=esp-idf

Merge branch 'feature/btdm_add_set_local_icon_api' into 'master'

Component/bt: add set gap icon API

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

12dbe4dac5ccca0708667b97b07e8c75365ae3e1