Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 07:45:02 +0000 (16:45 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 07:45:07 +0000 (16:45 +0900)
Change-Id: I53ed49b51053aee20484c8953e3fdc174e7a23e0


Trivial merge