Merge branch 'devel/master' into tizen accepted/tizen/unified/20190116.160701 submit/tizen/20190114.061957 submit/tizen/20190116.043322
authorJiyun Yang <ji.yang@samsung.com>
Mon, 14 Jan 2019 06:04:35 +0000 (15:04 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Mon, 14 Jan 2019 06:04:35 +0000 (15:04 +0900)

Trivial merge