Merge branch 'devel/master' into tizen
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 05:21:23 +0000 (14:21 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 9 Jul 2018 05:21:28 +0000 (14:21 +0900)
Change-Id: Ia3399ae5ec0d3b8f8c164611617ea232ba4e745c


Trivial merge