Merge branch 'bugfix/btdm_fix_auth_mode_error_when_reconnection_in_smp_v3.1' into...

author Jiang Jiang Jian <jack@espressif.com>

Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)
diff --cc components/bt/bluedroid/bta/dm/bta_dm_act.c
Simple merge
diff --cc components/bt/bluedroid/btc/core/btc_dm.c
Simple merge
diff --cc components/bt/bluedroid/stack/smp/smp_act.c
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Wed, 9 Jan 2019 05:57:07 +0000 (13:57 +0800)
		1	2
components/bt/bluedroid/bta/dm/bta_dm_act.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/btc/core/btc_dm.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/stack/smp/smp_act.c	patch \|	diff1 \|	diff2 \|	blob \| history