Tian Hao 7a41ab6982 Merge branch 'master' into feature/btdm_bluedroid ... 1. update bt lib submodule # Conflicts: # components/bootloader/src/main/esp32.bootloader.ld # components/bt/component.mk # components/esp32/component.mk # components/esp32/lib		2016-11-24 15:45:04 +08:00
..
app_bt.c	Merge branch 'master' into feature/btdm_bluedroid	2016-11-24 15:45:04 +08:00
component.mk	examples: Update component.mk for new conventions	2016-11-16 14:20:47 +11:00