Merge branch 'devel/master' into tizen
authorminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:18:25 +0000 (10:18 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:18:25 +0000 (10:18 +0900)

Trivial merge