Merge branch 'devel/master' into tizen 32/127832/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:10:56 +0000 (11:10 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 02:11:04 +0000 (11:11 +0900)
commit20b0864d352a0f228f3e8501c23deeaafcdb7500
tree1981351e030dc33819931cd34fc4e42ff22799b9
parent0656b3f520715c76d3f064cd294343a7841cedd9
parentc0e4586a62648c89a91bc4bf617716704bb0e5d5
Merge branch 'devel/master' into tizen

Change-Id: Ic64edf62a115136a5bb387f0eb7c8be8c6040ad3