Merge branch 'tizen_3.0' into tizen 56/115256/1 accepted/tizen/common/20170217.161505 accepted/tizen/ivi/20170217.094352 accepted/tizen/mobile/20170217.094217 accepted/tizen/tv/20170217.094302 accepted/tizen/wearable/20170217.094336 submit/tizen/20170217.071740
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Feb 2017 05:47:09 +0000 (14:47 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Feb 2017 05:47:09 +0000 (14:47 +0900)
commit9944b1450c24e97d8f6c20e4edd6dbedb21e7325
tree18133da9adcb8bf8d93e1d2a3640c219b324a3c9
parent5b6ad3564d2cf2e1bfa3408dd1409ad28f8ada1e
parentac42efcfc8c44f289e07ea7f8abc566171537b87
Merge branch 'tizen_3.0' into tizen

Change-Id: Ic6f8129970065e3459a38b73f41f189f6be14088
packaging/capi-ui-inputmethod.spec
src/inputmethod.cpp