From: chleun.moon <chleun.moon@samsung.com>
Date: Wed, 2 Nov 2016 05:45:37 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_3.0
X-Git-Tag: accepted/tizen/3.0.m2/tv/20170105.024222^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_3.0_tv;p=platform%2Fupstream%2Favahi.git

Merge branch 'tizen' into tizen_3.0

Change-Id: I844c10b186440884f13ca2ab892ed1cd2cb89f63
Signed-off-by: cheoleun <chleun.moon@samsung.com>
---

1ebd8aae011be4d87e49c37c9a4f9165767580bb