From: Ivan Grokhotkov <ivan@espressif.com>
Date: Sun, 23 Jul 2017 06:35:33 +0000 (+0800)
Subject: Merge branch 'cherry-pick-292c2abd' into 'release/v2.1'
X-Git-Tag: v2.1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efdbc63b5feed6b7808795c05bed09e0cb2c9d43;p=esp-idf

Merge branch 'cherry-pick-292c2abd' into 'release/v2.1'

Merge branch 'bugfix/init_nvs_in_bluetooth' into 'master'

See merge request !1031
---

efdbc63b5feed6b7808795c05bed09e0cb2c9d43