Merge branch 'devel/master(1.2.60)' into tizen_4.0 26/154826/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 09:10:19 +0000 (18:10 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 09:10:37 +0000 (18:10 +0900)
commiteb651a8273140d65bebbe6d88fdfaf9b57caf0d2
tree092860e952f05a26b481d6d7487a35ffabbb5a21
parent8af08369ee34d382e735ee71496dd8d7423f2a9a
parent3341b08e23b98cc2fa125da4f04b24162a4009d1
Merge branch 'devel/master(1.2.60)' into tizen_4.0

Change-Id: I8b30382d535f9ea3eca8952f7eacd0425f5f9b78