Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:36:43 +0000 (15:36 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:36:43 +0000 (15:36 +0900)

Trivial merge