Merge branch 'devel/master' into tizen accepted/tizen/unified/20180802.134946 submit/tizen/20180802.052907 submit/tizen/20180802.072959
authorminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 03:07:50 +0000 (12:07 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 03:07:50 +0000 (12:07 +0900)

Trivial merge