Merge branch 'feature/btdm_support_oob_in_SMP' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)
diff --cc components/bt/bluedroid/bta/dm/bta_dm_act.c
Simple merge
diff --cc components/bt/bluedroid/bta/include/bta/bta_api.h
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Thu, 8 Nov 2018 08:44:15 +0000 (16:44 +0800)
		1	2
components/bt/bluedroid/bta/dm/bta_dm_act.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/bta/include/bta/bta_api.h	patch \|	diff1 \|	diff2 \|	blob \| history