Merge branch 'upstream' into tizen 26/96426/1
authorYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:22:24 +0000 (11:22 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Wed, 9 Nov 2016 02:22:24 +0000 (11:22 +0900)
commitf57d349bba373ddb713a249cb2866198346ae011
tree54b98d64d1dfb0667097ce326a2a3d32dfe060b0
parent4486382682f22650e6de23a607d92dbccc3c9aee
parenteb886f120599b2a184db20b527db6dfdfcb7852e
Merge branch 'upstream' into tizen

Conflicts:
ares_set_local_dev.3
ares_set_servers_csv.3

Change-Id: I1da63c678df60657e903fd4917f07784bd37ce94
ares_set_servers_csv.3