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


Trivial merge