Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Wed, 2 Jan 2019 01:38:21 +0000 (10:38 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Wed, 2 Jan 2019 01:38:26 +0000 (10:38 +0900)
Change-Id: I90ad856b503d9349ac934d779bfb4786c993f966


Trivial merge