Merge branch 'devel/master' into tizen 56/132656/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:55:54 +0000 (14:55 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:56:02 +0000 (14:56 +0900)
commitdee919a69ffd53838d5bff1ec81c23f499dae13b
tree4536b75cb6bffee39924f1315394a87e43834391
parent2cc8a37835d5c332f1af6846e2a1208345d2e30c
parenteb3641c5f89d0ad118aff7862b1e7669ea9828d9
Merge branch 'devel/master' into tizen

Change-Id: I88623c69468ba25730b9265dbd9a0bad1b803ee7