Merge branch 'tizen_3.0' into tizen 85/112085/1 accepted/tizen/common/20170126.082018 accepted/tizen/ivi/20170131.040811 accepted/tizen/mobile/20170131.040725 accepted/tizen/tv/20170131.040741 accepted/tizen/wearable/20170131.040757 submit/tizen/20170126.071607
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 26 Jan 2017 02:02:18 +0000 (11:02 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 26 Jan 2017 02:04:02 +0000 (11:04 +0900)
commit8191bed1224f34201910a252439f50c84cd7b024
treeddc763acd26ce512f377e6f8e0a74709a2e9bc7f
parent0be5ab8f971463cac7f2db7070c52e2d69c8ba0f
parentea891c1a60a8be51b251607e6f82d29dc696c94d
Merge branch 'tizen_3.0' into tizen

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