Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:10:44 +0000 (14:10 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:10:50 +0000 (14:10 +0900)
Change-Id: I58f83a9978a439df601a07b0815101f018c86457


Trivial merge