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


Trivial merge