Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Wed, 2 Jan 2019 02:03:11 +0000 (11:03 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Wed, 2 Jan 2019 02:03:16 +0000 (11:03 +0900)
Change-Id: Iac4502225e8c93a5e906241a664897c0a167e527


Trivial merge