Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 07:47:00 +0000 (16:47 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 07:47:22 +0000 (16:47 +0900)
Change-Id: I6f3086e75fc83fe9ee7d5515d9a19f26f2df1237


Trivial merge