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


Trivial merge