Merge branch 'devel/master' into tizen 98/176998/1
authorDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 11:12:20 +0000 (20:12 +0900)
committerDaekwang Ryu <dkdk.ryu@samsung.com>
Tue, 24 Apr 2018 11:12:20 +0000 (20:12 +0900)
commitbe6d360585ec77f194222244604c002d4497616c
treedb7c2d384edaaf76922ac6887b20778c78e2daa8
parent96d0c7d4a71f56ef7de74b70e3f0ce3d85202101
parentadedf8c8d3a6a7680ffe7c5b28f2f6b82d7a3cbe
Merge branch 'devel/master' into tizen

Change-Id: Ibb77af3b1575d90842a7b48595afb1d1014311dc