Merge branch 'devel/master' into tizen 24/182324/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:10:05 +0000 (10:10 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:24:50 +0000 (10:24 +0900)
Change-Id: Ic675903cd6ea334a519450cbe49fbf72f532318d


Trivial merge