Merge branch 'devel/master' into tizen
authorSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 05:46:07 +0000 (14:46 +0900)
committerSunghyun kim <scholb.kim@samsung.com>
Mon, 2 Jul 2018 05:47:10 +0000 (14:47 +0900)
commit0bff22c260542a98b720ad5d93613ac6fcf2b291
tree2878dfa6486b9b7f407a46f8a28f953a71c8c35c
parent5acfe3b5233f1e2dbcd93f20dc1f974a3d767719
parentcbf11609c3348e53628811ceec725a7fcfeade77
Merge branch 'devel/master' into tizen

Change-Id: I9ed29c7a55728d00f2fe480665da393a16f4a672