Merge "Fix the defect of calculating time" into tizen_2.2