Merge branch 'devel/master' into tizen
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:39:49 +0000 (15:39 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:39:56 +0000 (15:39 +0900)
Change-Id: Ibe06146397327bcb53af5b529b2c2a4496bd8fd5


Trivial merge