Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 06:07:05 +0000 (15:07 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 06:21:58 +0000 (15:21 +0900)
Change-Id: Icd9d7483fc35172caa0e3933b1b084ccadb2cbe8


Trivial merge