Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 03:16:45 +0000 (12:16 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 03:16:49 +0000 (12:16 +0900)
Change-Id: I91c861bc21ba3026fd39fca3559f47cc124f6678


Trivial merge