Merge from tizen 2.4 77/40077/1 tizen_3.0.2015.q2_common accepted/tizen/mobile/20150603.042801 submit/tizen_common/20150604.888888 submit/tizen_mobile/20150601.083112 submit/tizen_mobile/20150601.135223 submit/tizen_mobile/20150602.034811 submit/tizen_mobile/20150603.020854
authorKyuho Jo <kyuho.jo@samsung.com>
Thu, 28 May 2015 13:09:44 +0000 (22:09 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Thu, 28 May 2015 13:09:44 +0000 (22:09 +0900)
commit4aeaddef7085bb57d1ea5244a921492f596405b9
treefaffc75c3cee0224e44c4e0694c5cad5e568dd41
parentcb3cb3db51924ad46a6da076b7e963ef4743dbdd
Merge from tizen 2.4

Change-Id: I8806d0d4caa849d219ef7abd005309840465c1ab
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>
TC/testcase/utc_shortcut.c
lib/include/shortcut.h
lib/include/shortcut_manager.h
lib/src/main.c
test/icon.c