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


Trivial merge