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


Trivial merge