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)
commit76efccbdb06740016f7d0923f25e11f6efb15499
tree9dbe1f3773fc056fb38e0c1dad220d661ee37504
parent558ff214168dc152f124998ce53eb3a338c9d34a
parentfcf2911b143dad771ee51ca2c685b054bd5b0f67
Merge branch 'devel/master' into tizen

Change-Id: Ib23189cdfa5a02959dd64c57de7d02bbddb48f44