Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Mon, 29 Apr 2019 04:07:56 +0000 (13:07 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Mon, 29 Apr 2019 04:07:56 +0000 (13:07 +0900)

Trivial merge