Merge branch 'devel/master(1.2.60)' into tizen_4.0 32/154832/1 accepted/tizen/4.0/unified/20171012.230031 submit/tizen_4.0/20171012.085532 submit/tizen_4.0/20171012.091159 submit/tizen_4.0/20171014.001058 tizen_4.0.IoT.p1_release
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 09:28:36 +0000 (18:28 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 09:29:05 +0000 (18:29 +0900)
Change-Id: I359e9193e6b0ed7549d152a27321ba4269ed2d59


Trivial merge