From: Taesoo Jun <steve.jun@samsung.com>
Date: Mon, 5 Mar 2018 10:13:16 +0000 (+0900)
Subject: Fix merge conflict
X-Git-Tag: submit/tizen_4.0/20180306.081613^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfadaacb83d65db53b64baea919f75a3f77fa771;p=platform%2Fcore%2Fapi%2Fwifi.git

Fix merge conflict

Change-Id: I601af06589559dc22b7fd110f102e98cacd69b23
---

bfadaacb83d65db53b64baea919f75a3f77fa771