Merge branch 'devel/master' into tizen
authorJiyun Yang <ji.yang@samsung.com>
Tue, 29 Jan 2019 06:18:02 +0000 (15:18 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Tue, 29 Jan 2019 06:18:02 +0000 (15:18 +0900)

Trivial merge