Merge branch 'devel/master' into tizen 11/182311/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:29:36 +0000 (10:29 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:29:41 +0000 (10:29 +0900)
Change-Id: If0713f4d32f254deabe65d7b41f4b0b654aa43e5


Trivial merge