Merged the tizen 2.4 and fixed the bug

No match.