From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 26 Apr 2018 06:31:04 +0000 (+0800)
Subject: Merge branch 'bugfix/fix_a_minor_compile_issue' into 'master'
X-Git-Tag: v3.1-beta1~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=464dbbdaa906e1984ca04f76d3879000d0041700;p=esp-idf

Merge branch 'bugfix/fix_a_minor_compile_issue' into 'master'

Bugfix/fix a minor compile issue

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

464dbbdaa906e1984ca04f76d3879000d0041700