Merge branch 'devel/master' into tizen 69/141669/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:05:25 +0000 (10:05 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:05:29 +0000 (10:05 +0900)
commit4c07f6887530e7359ba7de30b1021a2f0764c0a9
treea35abbba9a0a7ca8a6876f4e1aba4940d2a46c0c
parentcd36240ef9f110c0a7f9cc388636c030b4771ad1
parent482152634bba9ec7a2b4eda7655a025dc149b6cc
Merge branch 'devel/master' into tizen

Change-Id: Ie317eb21872639948348aa7bce28387a2d2f916e