Merge branch 'tizen_3.0' into tizen 80/107780/1 accepted/tizen/common/20161230.055042 accepted/tizen/ivi/20170101.223835 accepted/tizen/mobile/20170101.223738 accepted/tizen/tv/20170101.223755 accepted/tizen/wearable/20170101.223817 submit/tizen/20161230.010023
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 30 Dec 2016 00:55:57 +0000 (09:55 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 30 Dec 2016 00:55:57 +0000 (09:55 +0900)
commit0be5ab8f971463cac7f2db7070c52e2d69c8ba0f
treeddaea99e4c597b71804f752cefb233577501c587
parentd7f1b30747cc4eaf1d32a8b974dbfe8261d9a4fa
parent4480e86f1a5fef02dfcca88e6770a37a5d3f1be1
Merge branch 'tizen_3.0' into tizen

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