Merge branch 'devel/master' into tizen 39/179439/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 01:30:00 +0000 (10:30 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 01:30:06 +0000 (10:30 +0900)
Change-Id: I76da58236ad2fffe1ce87e4814556c67ca3c83e0


Trivial merge