Merge branch 'devel/master' into tizen
authorSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Jul 2018 05:44:54 +0000 (14:44 +0900)
committerSeungho, Baek <sbsh.baek@samsung.com>
Mon, 16 Jul 2018 05:44:54 +0000 (14:44 +0900)

Trivial merge