Merge "fix build error" into tizen_2.1