From: Angus Gratton <angus@espressif.com>
Date: Mon, 4 Sep 2017 23:25:08 +0000 (+0800)
Subject: Merge branch 'bugfix/bootloader_ota_sel' into 'master'
X-Git-Tag: v3.1-dev~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11a87ca8113abe48981c3cb0aa157eee606f5f6d;p=esp-idf

Merge branch 'bugfix/bootloader_ota_sel' into 'master'

Fix bootloader OTA regression

See merge request !1205
---

11a87ca8113abe48981c3cb0aa157eee606f5f6d