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)
Change-Id: If7b14a6bca2079b3cc58a0432a9eb05a41ea5ceb

1  2 
ares_set_servers_csv.3

Simple merge