Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Mon, 14 Jan 2019 05:44:36 +0000 (14:44 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Mon, 14 Jan 2019 05:44:36 +0000 (14:44 +0900)

Trivial merge