Merge branch 'bugfix/bt_correct_inquiry_mode_name' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)
diff --cc components/bt/bluedroid/api/esp_gap_bt_api.c
Simple merge
diff --cc components/bt/bluedroid/api/include/esp_gap_bt_api.h
Simple merge
author	Jiang Jiang Jian <jack@espressif.com>
	Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Fri, 20 Apr 2018 10:14:57 +0000 (18:14 +0800)
		1	2
components/bt/bluedroid/api/esp_gap_bt_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/bt/bluedroid/api/include/esp_gap_bt_api.h	patch \|	diff1 \|	diff2 \|	blob \| history