From: Tian Hao Date: Wed, 30 Nov 2016 11:08:40 +0000 (+0800) Subject: Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature... X-Git-Tag: v1.0~2^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba96c0d2e9c50d8fea3bc7f3a013cb95b6397d69;p=esp-idf Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature/btdm_bluedroid --- ba96c0d2e9c50d8fea3bc7f3a013cb95b6397d69