Merge branch 'devel/master(1.1.2 ~ 1.1.7)' into tizen 40/50140/1 accepted/tizen/common/20151218.120158 accepted/tizen/mobile/20151102.112646 accepted/tizen/tv/20151102.112713 accepted/tizen/wearable/20151102.112736 submit/tizen/20151102.084015 submit/tizen_common/20151209.063055
authortaeyoon <taeyoon0.lee@samsung.com>
Mon, 26 Oct 2015 04:27:56 +0000 (13:27 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Mon, 26 Oct 2015 04:28:31 +0000 (13:28 +0900)
Change-Id: I3038d1242416d1bcc9e31f931cc690fdced8dc97


Trivial merge