Merge branch 'devel/master' into tizen 42/179442/1
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 01:34:29 +0000 (10:34 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Fri, 18 May 2018 01:34:33 +0000 (10:34 +0900)
Change-Id: Id234c527de6e0a279190d867f75a0ea46016664b


Trivial merge