Merge "merge tizen 2.4" into tizen accepted/tizen/mobile/20151111.231830 accepted/tizen/tv/20151111.231836 accepted/tizen/wearable/20151111.231848 submit/tizen/20151111.052415
authorjongmyeongko <jongmyeong.ko@samsung.com>
Tue, 10 Nov 2015 07:10:49 +0000 (23:10 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 10 Nov 2015 07:10:49 +0000 (23:10 -0800)

Trivial merge