wangmengyang 49b68c38fa Merge branch 'master' into feature/btdm_avrc ... # Conflicts: # components/bt/bluedroid/hci/packet_fragmenter.c # components/bt/bluedroid/stack/include/gatt_api.h		2017-01-17 10:36:26 +08:00
..
bt_sdp.h	component/bt : cleanup id/uuid define	2016-11-16 00:34:48 +08:00
btc_gap_ble.h	component/bt : cleanup a macro	2016-11-29 14:38:58 +08:00
btc_gap_bt.h	component/bt : add license header	2016-11-25 01:58:26 +08:00
btc_gatt_util.h	component/bt : change api for V2.0	2016-12-19 17:15:41 +08:00
btc_gattc.h	component/bt : change api for V2.0	2016-12-19 17:15:41 +08:00
btc_gatts.h	component bt:Added the create attribute table method to the new API	2017-01-11 16:57:19 +08:00
dis_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
hid_le_prf.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00
srvc_api.h	component/bt : run astyle handle the code files	2016-11-25 02:10:15 +08:00