Merge branch 'devel/master' into tizen
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 1 Oct 2018 02:04:43 +0000 (11:04 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 1 Oct 2018 02:04:43 +0000 (11:04 +0900)

Trivial merge