Merge branch 'devel/master (1.2.60)' into tizen_4.0 92/154792/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 08:26:42 +0000 (17:26 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 08:27:22 +0000 (17:27 +0900)
commit39518cbe2de0b8786c000d043d186f82b9b81bca
tree4e266c0d1fc66b7193c03126ea5f1a5c945540bc
parentbf0fc38794304b32d2bb7770e42d2e0dc82c4714
parent6f5e542dfe306f91b6a3094cde65dba1eb478967
Merge branch 'devel/master (1.2.60)' into tizen_4.0

Change-Id: Ide9c356938107479ed2288c81f0876a9c8f445bf