esp-idf/components
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
..
2016-11-22 14:45:50 +08:00
2016-11-16 15:57:34 +11:00
2016-11-24 08:20:21 +11:00
2016-11-24 08:20:21 +11:00
2016-11-22 14:45:50 +08:00
2016-11-23 11:29:36 +08:00
2016-11-22 14:45:50 +08:00
2016-11-22 14:45:50 +08:00