Merge branch 'tizen' into tizen_base 81/96781/1 accepted/tizen/4.0/base/20170811.093019 accepted/tizen/4.0/base/20170828.221324 accepted/tizen/base/20170707.183634 submit/tizen_4.0_base/20170811.071500 submit/tizen_4.0_base/20170828.000000 submit/tizen_4.0_base/20170828.000001 submit/tizen_base/20170703.013654 submit/tizen_base/20170705.023439 tizen_4.0.IoT.p1_release tizen_4.0.m2_release
authorYu Jiung <jiung.yu@samsung.com>
Thu, 10 Nov 2016 07:24:08 +0000 (16:24 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Thu, 10 Nov 2016 07:25:02 +0000 (16:25 +0900)
commit8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8
tree81f0750d91aa467df3ee81cf30d22a65db2e6685
parentccccebb78520ec3a26a18370936516b12ae5d53a
parent45e88a8337839e5fd88519bc55467053d521c9f6
Merge branch 'tizen' into tizen_base

Conflicts:
packaging/c-ares.spec

Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74