Merge branch 'devel/master' into tizen 85/181885/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 18 Jun 2018 12:39:15 +0000 (21:39 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 18 Jun 2018 12:39:22 +0000 (21:39 +0900)
Change-Id: I459cf653f3096d4b88c172f7ceef8bfb676c5ab1


Trivial merge