Merge branch 'devel/master' into tizen
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 08:33:06 +0000 (17:33 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 08:33:14 +0000 (17:33 +0900)
Change-Id: If9acf05b577d857efe190ef8aaeb84b8d9b54832


Trivial merge