Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 3 Sep 2018 02:05:28 +0000 (11:05 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 3 Sep 2018 02:05:28 +0000 (11:05 +0900)

Trivial merge