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


Trivial merge