Merge branch 'devel/master' into tizen 65/178465/1
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 04:57:39 +0000 (13:57 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 04:57:46 +0000 (13:57 +0900)
Change-Id: I2b2d1cbcbc714ef72cd98e191b6961ab437ff360


Trivial merge