Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 17 Dec 2018 05:29:12 +0000 (14:29 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 17 Dec 2018 05:29:18 +0000 (14:29 +0900)
Change-Id: I17061abd83cf1e9433df09600f3243ff51faa70a


Trivial merge