Merge branch 'devel/master' into tizen 00/182300/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:09:01 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:13:49 +0000 (10:13 +0900)
Change-Id: I1c7841144f6a8a0eebd3a5436fd9d71a1b4dea43


Trivial merge