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-02 17:42:26 +08:00
2016-11-26 13:09:55 +08:00
2016-11-16 11:05:55 +08:00
2016-11-26 13:09:55 +08:00
2016-11-25 15:54:18 +08:00
2016-11-28 18:06:24 +08:00
2016-11-25 15:54:18 +08:00
2016-11-25 15:54:18 +08:00
2016-11-25 02:10:15 +08:00
2016-11-28 18:06:24 +08:00
2016-11-25 02:10:15 +08:00
2016-11-25 02:10:15 +08:00
2016-11-25 02:10:15 +08:00
2016-11-25 02:10:15 +08:00