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


Trivial merge