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


Trivial merge