Merge "merge tizen 2.4" into tizen
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