wangmengyang 50227f12fd Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # components/bt/bluedroid/bta/include/bta_api.h # components/bt/bluedroid/bta/include/bta_gattc_int.h # components/bt/bluedroid/hci/hci_hal_h4.c # components/bt/bluedroid/hci/hci_layer.c # components/bt/bluedroid/include/bt_target.h # components/bt/bluedroid/stack/btu/btu_init.c		2016-11-28 18:06:24 +08:00
..
bluedroid	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-28 18:06:24 +08:00
include	Merge branch 'master' into feature/btdm_bluedroid	2016-11-24 15:45:04 +08:00
lib@a0f2d0a961	component/bt : wifi/bt software coexist option	2016-11-24 19:57:47 +08:00
bt.c	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
component.mk	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-28 18:06:24 +08:00
Kconfig	component/bt : change task to decease dram(heap)	2016-11-25 23:37:46 +08:00