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

Trivial merge