wangmengyang 73f00732cf Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp ... # Conflicts: # components/bt/bluedroid/bta/sys/bta_sys_main.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_api.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_ct.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_bld_tg.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_opt.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_ct.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_pars_tg.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_sdp.c # components/bt/bluedroid/btc/profile/std/avrc/avrc_utils.c # components/bt/bluedroid/btc/profile/std/avrc/include/avrc_int.h # components/bt/bluedroid/btc/profile/std/include/avct_api.h # components/bt/bluedroid/btc/profile/std/include/avdt_api.h # components/bt/bluedroid/btc/profile/std/include/avdt_defs.h # components/bt/bluedroid/btc/profile/std/include/avdtc_api.h # components/bt/bluedroid/btc/profile/std/include/avrc_api.h # components/bt/bluedroid/btc/profile/std/include/avrc_defs.h # components/bt/bluedroid/gki/gki_buffer.c # components/bt/bluedroid/hci/hci_hal_h4.c # components/bt/bluedroid/hci/hci_layer.c # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/include/bt_trace.h # components/bt/bluedroid/osi/alarm.c # components/bt/bluedroid/profiles/std/avrc/avrc_api.c # components/bt/bluedroid/profiles/std/avrc/avrc_bld_ct.c # components/bt/bluedroid/profiles/std/avrc/avrc_bld_tg.c # components/bt/bluedroid/profiles/std/avrc/avrc_opt.c # components/bt/bluedroid/profiles/std/avrc/avrc_pars_ct.c # components/bt/bluedroid/profiles/std/avrc/avrc_pars_tg.c # components/bt/bluedroid/profiles/std/avrc/avrc_sdp.c # components/bt/bluedroid/profiles/std/avrc/avrc_utils.c # components/bt/bluedroid/profiles/std/avrc/include/avrc_int.h # components/bt/bluedroid/profiles/std/include/avct_api.h # components/bt/bluedroid/profiles/std/include/avdt_api.h # components/bt/bluedroid/profiles/std/include/avdt_defs.h # components/bt/bluedroid/profiles/std/include/avdtc_api.h # components/bt/bluedroid/profiles/std/include/avrc_api.h # components/bt/bluedroid/profiles/std/include/avrc_defs.h # components/bt/bluedroid/stack/avdt/include/avdt_defs.h # components/bt/bluedroid/stack/avrc/avrc_api.c # components/bt/bluedroid/stack/avrc/avrc_bld_ct.c # components/bt/bluedroid/stack/avrc/avrc_bld_tg.c # components/bt/bluedroid/stack/avrc/avrc_opt.c # components/bt/bluedroid/stack/avrc/avrc_pars_ct.c # components/bt/bluedroid/stack/avrc/avrc_pars_tg.c # components/bt/bluedroid/stack/avrc/avrc_sdp.c # components/bt/bluedroid/stack/avrc/avrc_utils.c # components/bt/bluedroid/stack/avrc/include/avrc_int.h # components/bt/bluedroid/stack/btu/btu_task.c # components/bt/bluedroid/stack/include/avct_api.h # components/bt/bluedroid/stack/include/avdt_api.h # components/bt/bluedroid/stack/include/avdtc_api.h # components/bt/bluedroid/stack/include/avrc_api.h # components/bt/bluedroid/stack/include/avrc_defs.h # components/bt/bluedroid/stack/include/gatt_api.h # components/bt/bluedroid/stack/l2cap/l2c_main.c # components/bt/component.mk # examples/06_bluedroid_demos/components/bluedroid_demos/app_core/bt_app_core.c		2016-11-25 19:45:29 +08:00
..
a2d_api.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
a2d_sbc.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avct_api.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avdt_api.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avdtc_api.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avrc_api.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
avrc_defs.h	component/bt: transport bluedroid avct, avdt, avrc and a2dp module to stack	2016-11-02 17:42:26 +08:00
bt_types.h	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
btm_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
btm_ble_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
btm_ble_int.h	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
btm_int.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
btu.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
dyn_mem.h	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
gap_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
gatt_api.h	Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp	2016-11-25 19:45:29 +08:00
gattdefs.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hcidefs.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hcimsgs.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hiddefs.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hidh_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
l2c_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
l2cap_client.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
l2cdefs.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
port_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
port_ext.h	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
profiles_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
rfcdefs.h	component/bt : new architectecture	2016-11-15 20:56:15 +08:00
sdp_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
sdpdefs.h	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
smp_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
uipc_msg.h	component/bt: enable some AVDT macros and minor issue fixes for btif;	2016-11-04 18:27:26 +08:00