Merge branch 'devel/master' into tizen 03/178503/1
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 07:07:22 +0000 (16:07 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 07:07:28 +0000 (16:07 +0900)
Change-Id: I899bf0904922312864afb399a7f7383bf3231739


Trivial merge