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


Trivial merge