Merge branch 'devel/master' into tizen 19/182319/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:09:46 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:24:57 +0000 (10:24 +0900)
Change-Id: Ia901c87ac96c3072f00bdfd0fde9843699740a73


Trivial merge