Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)
diff --cc components/bt/bluedroid/bta/include/bta_gatt_api.h
Simple merge
diff --cc components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Fri, 30 Mar 2018 06:57:13 +0000 (14:57 +0800)
		1	2
components/bt/bluedroid/bta/include/bta_gatt_api.h	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c	patch \|	diff1 \|	diff2 \|	blob \| history