Merge branch 'devel/master' into tizen 92/141492/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:00:01 +0000 (10:00 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:00:08 +0000 (10:00 +0900)
commit4eec1cbb873308422fbc4d67ebec530604d2cad2
tree5ee884896f1846f0445797149786b11bafb6efee
parent6654a7831fd9b56f881fe1118cdf1804669d879b
parent2197e10ece46faa84a2b64c94af78a2bf2546192
Merge branch 'devel/master' into tizen

Change-Id: Ia7717724d74a848f6693842eb843170d3d41ddae