Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 17 Dec 2018 04:59:53 +0000 (13:59 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 17 Dec 2018 05:00:06 +0000 (14:00 +0900)
Change-Id: I5ca86f9386c4230e7240829321b76107e52655a4


Trivial merge