Merge "Update the description of Timer" into tizen_2.1