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)
Change-Id: I8b30382d535f9ea3eca8952f7eacd0425f5f9b78


Trivial merge