Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 05:46:07 +0000 (14:46 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 05:47:10 +0000 (14:47 +0900)
Change-Id: I9ed29c7a55728d00f2fe480665da393a16f4a672


Trivial merge