Merge branch 'devel/master' into tizen
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 02:36:10 +0000 (11:36 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Mon, 10 Sep 2018 02:36:17 +0000 (11:36 +0900)
Change-Id: I3400fe5e0fbee5c7246498c765dc8accb9f29d9b


Trivial merge