[tizen_2.1] merge with private