Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen 31/50131/6
authortaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 06:13:46 +0000 (15:13 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Wed, 28 Oct 2015 06:13:46 +0000 (15:13 +0900)
Change-Id: Ie118b134b69250ba3dc3db5c3e18db1650994bbb


Trivial merge