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
..
btc_gap_ble.c	component/bt: change MACRO to inline function when invoking callbacks	2017-01-11 14:08:16 +08:00
btc_gap_bt.c	component/bt: API clean up for the A2DP example	2016-12-26 17:26:54 +08:00