Merge "Beautify Source Code of base_collection/*" into tizen_2.2