Merge branch 'devel/master' into tizen 33/190333/1
authordongsug.song <dongsug.song@samsung.com>
Mon, 1 Oct 2018 04:37:40 +0000 (13:37 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Mon, 1 Oct 2018 04:38:14 +0000 (13:38 +0900)
Change-Id: I6d7c0afc5cd3bc652bec1b957a9c847912927dea


Trivial merge