Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:32:00 +0000 (17:32 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:32:08 +0000 (17:32 +0900)
Change-Id: I0cb443d92acce4be7ae55c5a903a47666d09eb16


Trivial merge