Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Tue, 13 Nov 2018 06:28:17 +0000 (15:28 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Tue, 13 Nov 2018 06:28:23 +0000 (15:28 +0900)
Change-Id: I8b5ff9bca31fdfa65417a8d7ffcd54eb6fc1798d


Trivial merge