Merge branch 'tizen_2.4' into tizen_2.4_develop
authorminkee.lee <minkee.lee@samsung.com>
Fri, 17 Apr 2015 07:56:10 +0000 (16:56 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Fri, 17 Apr 2015 07:56:38 +0000 (16:56 +0900)
Change-Id: I08533f545937bcbde6eecaf0711f80d3feaa2273
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Trivial merge