Merge remote-tracking branch 'origin/tizen_4.0' into 'origin/tizen' 05/161405/1 accepted/tizen/unified/20171124.064553 submit/tizen/20171123.081046
authorr.tyminski <r.tyminski@partner.samsung.com>
Thu, 23 Nov 2017 07:48:24 +0000 (08:48 +0100)
committerr.tyminski <r.tyminski@partner.samsung.com>
Thu, 23 Nov 2017 07:52:26 +0000 (08:52 +0100)
Change-Id: Idd6e91b078eb706a88c1f6270e14cb663cfcc3b2


Trivial merge