Merge branch 'devel/master' into tizen accepted/tizen/unified/20180814.063226 submit/tizen/20180813.085527
authorWonSik Jung <sidein@samsung.com>
Mon, 13 Aug 2018 08:53:28 +0000 (17:53 +0900)
committerWonSik Jung <sidein@samsung.com>
Mon, 13 Aug 2018 08:53:28 +0000 (17:53 +0900)

Trivial merge