Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Mon, 17 Jun 2019 06:21:08 +0000 (15:21 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Mon, 17 Jun 2019 06:21:08 +0000 (15:21 +0900)

Trivial merge