Merge branch 'devel/master (1.2.49)' into tizen 48/140148/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:43:52 +0000 (12:43 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Mon, 24 Jul 2017 03:44:11 +0000 (12:44 +0900)
Change-Id: I808b333f7fa76a20b275603d5a1e52b2d993abd4


Trivial merge