Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 07:41:01 +0000 (16:41 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 07:41:04 +0000 (16:41 +0900)
Change-Id: I685cdd4efd5263af951c7264306eb36cae8eb36c


Trivial merge