Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 06:51:20 +0000 (15:51 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 06:51:26 +0000 (15:51 +0900)
Change-Id: Icb0af3e7c49794587ce3f6e524e6bc48fc251ef6


Trivial merge