Merge branch 'tizen_3.0' into tizen 14/104214/1 accepted/tizen/common/20161214.155954 accepted/tizen/ivi/20161213.003640 accepted/tizen/mobile/20161213.003551 accepted/tizen/tv/20161213.003614 accepted/tizen/wearable/20161213.003626 submit/tizen/20161212.223531
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 12 Dec 2016 22:31:47 +0000 (07:31 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 12 Dec 2016 22:31:52 +0000 (07:31 +0900)
commit79323ba7f0f5861d4f9d1a8b5023b80e3eedd30d
treea68731f5bd725d46428b80fd08a7a13f87e555ad
parentee088dfb400986a3bc7f4d346aa6742d7efed5df
parent73e57caa38ab187398f608099f4bdae5c1c1bed2
Merge branch 'tizen_3.0' into tizen

Change-Id: I7bfb9f3fc60d96aab123a2e3a3c82ecf36318b0d
packaging/org.tizen.inputmethod-setting.spec