Merge branch 'feature/btdm_add_api_to_set_channel_classification' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)
diff --cc components/bt/host/bluedroid/api/esp_gap_bt_api.c
Simple merge
diff --cc components/bt/host/bluedroid/btc/core/btc_util.c
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Sat, 26 Oct 2019 12:42:58 +0000 (20:42 +0800)
		1	2
components/bt/host/bluedroid/api/esp_gap_bt_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/host/bluedroid/btc/core/btc_util.c	patch \|	diff1 \|	diff2 \|	blob \| history