Merge branch 'upstream' into tizen 27/96427/1
authorYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:24:14 +0000 (11:24 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:24:20 +0000 (11:24 +0900)
commit04b1a8c051547b221a3bdd74d68ab02df3e3f752
tree68d564a70d38771969fc9f946fb16792e8d4f7f7
parentf57d349bba373ddb713a249cb2866198346ae011
parent8e609b5f488d486a9e066ed494218d966f489938
Merge branch 'upstream' into tizen

Change-Id: If7b14a6bca2079b3cc58a0432a9eb05a41ea5ceb
ares_set_servers_csv.3