Merge branch 'devel/master' into tizen 47/132647/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:54:18 +0000 (14:54 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:54:22 +0000 (14:54 +0900)
commitba317a3ac06a0b5988ea376cacb44576518b6adb
treeaeb5ba3ae80fd2c5f579adb3f5276cdc8026adac
parentc1f70c3022befdf697c595bcd17dc04d5ad60cea
parent198c199bbd9d751eddd478c4fbf39b864c25c0b6
Merge branch 'devel/master' into tizen

Change-Id: I95a7a6557ab4dfb8176aa08678bf25838f3357a7