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


Trivial merge