rebase the origin to the local

author Yulong <huangyulong@espressif.com>

Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)

committer Yulong <huangyulong@espressif.com>

Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)
author Yulong <huangyulong@espressif.com>
Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)
committer Yulong <huangyulong@espressif.com>
Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)
diff --cc components/bt/bluedroid/bta/gatt/bta_gattc_utils.c
Simple merge
author	Yulong <huangyulong@espressif.com>
	Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)
committer	Yulong <huangyulong@espressif.com>
	Mon, 13 Nov 2017 07:20:02 +0000 (02:20 -0500)