Jiang Jiang Jian 6adaeb0048 Merge branch 'bugfix/btdm_fix_crash_without_smp_when_deinit_bluedroid' into 'master' ... Component/bt: fix crash without SMP when deinit bluedroid See merge request idf/esp-idf!2375		2018-05-14 21:20:44 +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	Merge branch 'bugfix/btdm_reconnect_con_params_update_reject_in_smp' into 'master'	2018-05-14 20:19:29 +08:00
btc	Merge branch 'bugfix/btdm_fix_crash_without_smp_when_deinit_bluedroid' into 'master'	2018-05-14 21:20:44 +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_reconnect_con_params_update_reject_in_smp' into 'master'	2018-05-14 20:19:29 +08:00