Merge branch 'devel/master(1.1.39)' into tizen 15/75415/1
authortaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:58:54 +0000 (13:58 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Sat, 18 Jun 2016 04:59:29 +0000 (13:59 +0900)
Change-Id: I171f5248ddfb7c81b2b7c841e37e17e6372fd1ce


Trivial merge