Merge "update doxygen comments" into tizen_2.1