Merge branch 'devel/master' into tizen 85/178485/1
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 06:52:10 +0000 (15:52 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 06:52:15 +0000 (15:52 +0900)
Change-Id: Ie5121d08bd785adf6f67d81fdfb22ab0ce940087


Trivial merge