From: Ivan Grokhotkov <ivan@espressif.com>
Date: Wed, 15 Feb 2017 05:24:10 +0000 (+0800)
Subject: Merge branch 'bugfix/OTA_and_flash_encryption_incompatible' into 'master'
X-Git-Tag: v2.0-rc2~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25f05bef719b60135aa4a92e0e168b23035eaa52;p=esp-idf

Merge branch 'bugfix/OTA_and_flash_encryption_incompatible' into 'master'

bootloader_support: fix bug OTA & flash encryption incompatible

github issue:https://github.com/espressif/esp-idf/issues/253

See merge request !464
---

25f05bef719b60135aa4a92e0e168b23035eaa52