]> granicus.if.org Git - esp-idf/commit
Merge branch 'cherry-pick-c401a74b' into 'release/v3.0'
authorJiang Jiang Jian <jack@espressif.com>
Mon, 15 Jan 2018 10:49:25 +0000 (18:49 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Mon, 15 Jan 2018 10:49:25 +0000 (18:49 +0800)
commit309fb23ffcf8601e98ebfb8f9ddc93e1b681aa39
tree55feb784513b8395236ef6a26ba33fc91b337a9f
parente9a230c20c296690fb9b28c63335084c69af4c3b
parent449ce1bad9c52e0d86d68f6fda599dfac2811c1f
Merge branch 'cherry-pick-c401a74b' into 'release/v3.0'

Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master'

See merge request !1800