Jiang Jiang Jian 325920046f Merge branch 'bugfix/btdm_conn_fail_after_deinit_and_init_spp' into 'master' ... component/bt: Fix can't be connected if init SPP again after SPP deinit See merge request idf/esp-idf!2369		2018-05-11 15:38:03 +08:00
..
api	Merge branch 'feature/btdm_get_end_handle_when_get_include_service' into 'master'	2018-05-04 19:31:43 +08:00
bta	Component/bt: fix service change write busy	2018-05-09 20:49:26 +08:00
btc	Merge branch 'bugfix/btdm_conn_fail_after_deinit_and_init_spp' into 'master'	2018-05-11 15:38:03 +08:00
common/include/common	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
device	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
external/sbc	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
hci	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
main	component/bt : modify header files to avoid conflict	2018-04-26 19:32:06 +08:00
osi	component/bt: Added the hash key generated directly in the bluedroid module.	2018-04-28 03:11:05 -04:00
stack	Merge branch 'bugfix/btdm_fix_version_excahnge_issue' into 'master'	2018-05-04 19:30:03 +08:00