From: Yu Jiung <jiung.yu@samsung.com>
Date: Thu, 10 Nov 2016 07:24:08 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_base
X-Git-Tag: submit/tizen_base/20170703.013654^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8;p=platform%2Fupstream%2Fc-ares.git

Merge branch 'tizen' into tizen_base

Conflicts:
	packaging/c-ares.spec

Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
---

8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8