Merge: Merge 'tizen_2.4' into 'develop'.
authorminkee.lee <minkee.lee@samsung.com>
Mon, 13 Apr 2015 12:15:31 +0000 (21:15 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Mon, 13 Apr 2015 12:17:05 +0000 (21:17 +0900)
Change-Id: I1b7e41220d7fe83ef5e281a6dc43caf2246fa4fe
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Trivial merge