Merge branch 'devel/master' into tizen 25/179425/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:57:41 +0000 (09:57 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 00:57:45 +0000 (09:57 +0900)
Change-Id: Iab41124b9e91f6bdb53029a467d220611988f96f


Trivial merge