Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature/btdm_bluedroid

This commit is contained in:
Tian Hao
2016-11-30 19:08:40 +08:00
3 changed files with 22 additions and 20 deletions