From: Yu Jiung <jiung.yu@samsung.com>
Date: Wed, 9 Nov 2016 02:24:14 +0000 (+0900)
Subject: Merge branch 'upstream' into tizen
X-Git-Tag: submit/tizen_3.0_base/20161116.053912^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F96427%2F1;p=platform%2Fupstream%2Fc-ares.git

Merge branch 'upstream' into tizen

Change-Id: If7b14a6bca2079b3cc58a0432a9eb05a41ea5ceb
---

04b1a8c051547b221a3bdd74d68ab02df3e3f752