Merge branch 'devel/master' into tizen 06/178506/1 accepted/tizen/unified/20180514.094047 submit/tizen/20180510.080855
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 06:05:03 +0000 (15:05 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 06:05:09 +0000 (15:05 +0900)
Change-Id: Ic8f839615441c3482bc481c4eb5264a6749d9e73


Trivial merge