Merge branch 'tizen_3.0' into tizen 23/101923/1 accepted/tizen/common/20161202.233439 accepted/tizen/ivi/20161205.001123 accepted/tizen/mobile/20161205.001045 accepted/tizen/tv/20161205.001052 accepted/tizen/wearable/20161205.001059 submit/tizen/20161202.104354
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 2 Dec 2016 10:41:33 +0000 (19:41 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 2 Dec 2016 10:41:33 +0000 (19:41 +0900)
commitee088dfb400986a3bc7f4d346aa6742d7efed5df
treeade2d4cc68310c48422ea2294110d84b5f18a375
parent144bc23488b736da278c83a8b12fd267e725b9d3
parent1e2e36e6a9aa48118ff78453bb4f001580ff3b5c
Merge branch 'tizen_3.0' into tizen

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