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)
commit61260bb3612098fca7124f400637237cb3f181d6
tree8eef72abd41ef1c776b195f7cd8f9c02c04c700e
parent17475bf31b53b3393afb8a03d28613594970994c
parent46b672beb0e78dbc87638fddde897898c8f8805d
Merge branch 'devel/master' into tizen

Change-Id: I6f3086e75fc83fe9ee7d5515d9a19f26f2df1237