Merge branch 'devel/master' into tizen 79/141679/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:09:27 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:09:36 +0000 (10:09 +0900)
commit6848561111e2c61f934b4c51e7671a9596c954b4
tree6a3d5a263e01cfca6a8e743e528ff97ada8ff90f
parent859ba2ee72f2d8fcd1a20891692b824eed6d2ebe
parent51bd29a1b76ba44dd3b0cc34db1193ab83fa7661
Merge branch 'devel/master' into tizen

Change-Id: Ia57226a428e157e736be05fd313fb725d2f8fde1