Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 04:41:57 +0000 (13:41 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 21 Jan 2019 04:42:20 +0000 (13:42 +0900)
Change-Id: Iba97b78adb9655f4845c62b8c9b4a0ff25e5d250


Trivial merge