Merge branch 'devel/master' into tizen 20/179420/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:53:08 +0000 (09:53 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:53:12 +0000 (09:53 +0900)
Change-Id: I0ba1a012fa3872412d43270c6f1e7e6bb2462f2e


Trivial merge