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
..
2016-11-16 00:34:48 +08:00
2016-11-29 14:38:58 +08:00
2016-11-25 01:58:26 +08:00
2016-12-19 17:15:41 +08:00