Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen 39/50139/3 accepted/tizen/mobile/20151102.112611 accepted/tizen/tv/20151102.112656 accepted/tizen/wearable/20151102.112721 submit/tizen/20151102.084015
authortaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 06:10:36 +0000 (15:10 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 06:10:36 +0000 (15:10 +0900)
Change-Id: Id7ba385d4232b0674fba6495b4e1b7de09a7f1d6


Trivial merge