Merge branch 'bugfix/btdm_add_check_peer_addr_type_in_set_adv_params' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)
diff --cc components/bt/bluedroid/api/include/api/esp_gap_ble_api.h
Simple merge
diff --cc components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Tue, 20 Nov 2018 12:02:13 +0000 (20:02 +0800)
		1	2
components/bt/bluedroid/api/include/api/esp_gap_ble_api.h	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c	patch \|	diff1 \|	diff2 \|	blob \| history