Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:34:06 +0000 (17:34 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 5 Nov 2018 08:34:11 +0000 (17:34 +0900)
Change-Id: Ifef30efac27247c7019bef30306031e2ae8f09a7


Trivial merge