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-28 18:06:24 +08:00
2016-11-24 12:09:46 +08:00
2016-11-24 20:09:52 +08:00
2016-11-16 21:58:04 +08:00
2016-11-24 15:45:04 +08:00
2016-11-16 15:57:34 +11:00
2016-11-24 08:20:21 +11:00
2016-11-02 20:54:22 +08:00
2016-11-10 15:52:22 +11:00
2016-11-14 14:54:41 +11:00
2016-11-22 14:45:44 +08:00
2016-11-24 08:20:21 +11:00
2016-11-17 09:18:51 +11:00
2016-11-22 14:45:50 +08:00
2016-11-10 15:52:22 +11:00
2016-11-23 11:29:36 +08:00
2016-11-15 15:20:48 +08:00
2016-11-22 14:45:50 +08:00
2016-11-22 14:45:50 +08:00
2016-11-21 11:06:51 +08:00
2016-11-16 22:44:22 +08:00
2016-11-10 15:52:22 +11:00
2016-11-10 15:52:22 +11:00