Merge "[connman]: Fixed: ConnMan keep trying connection infintely" into tizen

author taesub kim <taesub.kim@samsung.com>

Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)
author taesub kim <taesub.kim@samsung.com>
Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)
diff --cc plugins/wifi.c
Simple merge
diff --cc src/service.c
Simple merge
author	taesub kim <taesub.kim@samsung.com>
	Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 7 Feb 2017 10:24:21 +0000 (02:24 -0800)
		1	2
plugins/wifi.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/service.c	patch \|	diff1 \|	diff2 \|	blob \| history