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

Trivial merge