Sukwon Suh [Thu, 13 Jun 2013 02:31:09 +0000 (11:31 +0900)]
fix bug in CanvasTexture::Update method
Change-Id: Ia3d13740574a4731e4f7b82d979ad0e1b41271b6
Signed-off-by: Sukwon Suh <sukwon.suh@samsung.com>
Dongjin Jeon [Mon, 10 Jun 2013 12:02:07 +0000 (21:02 +0900)]
Merge "Fixed TDIS-5448 : set current layout when orientation is changed" into tizen_2.2
Bongjoo Seo [Mon, 10 Jun 2013 03:06:51 +0000 (12:06 +0900)]
Applied context restoring
Change-Id: Iffdc38a849df5dd075e7bee05678f7d43934ae45
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>
Dongjin Jeon [Mon, 10 Jun 2013 10:45:08 +0000 (16:15 +0530)]
Fixed TDIS-5448 : set current layout when orientation is changed
Change-Id: I04cde30338accbaa1794932453e67016ecc1cd5d
Signed-off-by: Dongjin Jeon <dongjin2193.jeon@samsung.com>
Taejun [Mon, 10 Jun 2013 09:57:38 +0000 (18:57 +0900)]
Merge "Fix P130605-2383" into tizen_2.2
Taejun [Mon, 10 Jun 2013 09:52:14 +0000 (18:52 +0900)]
Fix P130605-2383
Change-Id: I4c217787e7d6946d4ea2f2671d7dcfd4054738e8
Bongjoo Seo [Mon, 10 Jun 2013 09:05:51 +0000 (18:05 +0900)]
Removed SetImageSource() API from Control codes
Change-Id: Iec5b6448490d6fedf1ef318ca3c7d330d5adbf2c
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>
youseong.ji [Mon, 10 Jun 2013 08:19:29 +0000 (17:19 +0900)]
Merge "Modified a logic for drawing item divider." into tizen_2.2
keonpyo.kong [Mon, 10 Jun 2013 08:00:22 +0000 (17:00 +0900)]
Fix TC fail IsFocus
Change-Id: Ia3d53bfd3fe14cc0bf25fd1d6c443c7b56bcafb9
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
minkyu kim [Sat, 8 Jun 2013 08:17:20 +0000 (17:17 +0900)]
add keycode for H/W Back and B/T Keyboard
Change-Id: I036dd92b4f14b7dc4b2e1800e3f7a67a144130f7
youseong.ji [Mon, 10 Jun 2013 07:09:28 +0000 (16:09 +0900)]
Modified a logic for drawing item divider.
Change-Id: Ice70eee1a45b1ec3ec105d3507b035393351a5d6
Signed-off-by: youseong.ji <youseong.ji@samsung.com>
Bang Keuck do [Mon, 10 Jun 2013 07:01:29 +0000 (16:01 +0900)]
Merge "Logic deleting indicator class was fixed." into tizen_2.2
woo [Mon, 10 Jun 2013 05:47:29 +0000 (14:47 +0900)]
Merge "add param to prevent lazy decoding in GetBitmapN onlyt for internal" into tizen_2.2
Keuckdo Bang [Mon, 10 Jun 2013 05:29:03 +0000 (14:29 +0900)]
Logic deleting indicator class was fixed.
Change-Id: I84fe958ed3926af461374d53cf11c26cac5abbe0
Minkyoung Kang [Mon, 10 Jun 2013 05:06:08 +0000 (14:06 +0900)]
merge the changed things from tizen_2.1
Change-Id: Iec66e730ef359f6a30a4eaf59d01c778edbd558f
clone [Mon, 10 Jun 2013 05:00:33 +0000 (14:00 +0900)]
Merge "Fixed N_SE-39526; changed to use Cancel event in item and grid." into tizen_2.2
Sungyeon Woo [Mon, 10 Jun 2013 04:58:37 +0000 (13:58 +0900)]
Merge "modified FC_WEIGHT_MEDIUM-> FC_WEIGHT_BOLD" into tizen_2.2
Bumseung Cho [Mon, 10 Jun 2013 04:48:12 +0000 (13:48 +0900)]
Merge "[P130605-4229] Service app crash issue" into tizen_2.2
Bumseung Cho [Mon, 10 Jun 2013 04:45:31 +0000 (13:45 +0900)]
[P130605-4229] Service app crash issue
Change-Id: Iaf9e0a6130ed86ca5b9e97844aeaa8b75d38cce8
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>
wonyoung12.lee [Mon, 10 Jun 2013 04:43:10 +0000 (13:43 +0900)]
Merge "Modify for N_SE-40500, Did not appear empty text when empty text has set in Uibuilder issue" into tizen_2.2
clone [Mon, 10 Jun 2013 04:40:27 +0000 (13:40 +0900)]
Fixed N_SE-39526; changed to use Cancel event in item and grid.
Change-Id: I2d72b29284519a9a5334436a091044a9736854b1
Signed-off-by: clone <ingyou.park@samsung.com>
Sungyeon Woo [Mon, 10 Jun 2013 04:26:20 +0000 (13:26 +0900)]
modified FC_WEIGHT_MEDIUM-> FC_WEIGHT_BOLD
Change-Id: I49bf915a0e31e2f729deeac6d6e73a1ec2501da5
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Choi Munseok [Mon, 10 Jun 2013 03:11:50 +0000 (12:11 +0900)]
Merge "Fixed the DimmingManager" into tizen_2.2
Choi Munseok [Mon, 10 Jun 2013 03:05:07 +0000 (12:05 +0900)]
Fixed the DimmingManager
Change-Id: I3d453fe303ab7a9dcc895f3fe1fcf3016ff87e94
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
woo [Tue, 4 Jun 2013 13:42:42 +0000 (22:42 +0900)]
add param to prevent lazy decoding in GetBitmapN onlyt for internal
Change-Id: I82b33388d2e194408eaf974faa3058e9a89f7cfb
Signed-off-by: woo <s-w.woo@samsung.com>
Bongjoo Seo [Mon, 10 Jun 2013 02:33:40 +0000 (11:33 +0900)]
Merge "Fixed a bug regarding SetImageSource()" into tizen_2.2
Sukwon Suh [Mon, 10 Jun 2013 01:25:02 +0000 (10:25 +0900)]
merge from tizen.2.1
Change-Id: I542d0cac6a83603c57232401cb9e9a1f023d4c87
Signed-off-by: Sukwon Suh <sukwon.suh@samsung.com>
Bongjoo Seo [Mon, 10 Jun 2013 00:27:06 +0000 (09:27 +0900)]
Fixed a bug regarding SetImageSource()
Change-Id: I703497971d5a2dfc5d683bee06db2c184654e322
Signed-off-by: Bongjoo Seo <bongjoo.seo@samsung.com>
Choi Munseok [Mon, 10 Jun 2013 00:17:07 +0000 (09:17 +0900)]
Removed unnecessary resizing a window
Change-Id: I607fc1444d79f57f9a38047d145e2b65ec2d114d
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
wonyoung12.lee [Sun, 9 Jun 2013 07:17:25 +0000 (16:17 +0900)]
Modify for N_SE-40500, Did not appear empty text when empty text has set in Uibuilder issue
Change-Id: Ie3518d2d0c29fcfbb47e59d4073a8e577d5185e5
Signed-off-by: wonyoung12.lee <wonyoung12.lee@samsung.com>
Syed Khaja Moinuddin [Sat, 8 Jun 2013 16:28:21 +0000 (21:58 +0530)]
fixed UTS issues in OptionMenu
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I1ad9321c8563b1cd0a1e63471ad1e789014baafd
Syed Khaja Moinuddin [Sat, 8 Jun 2013 15:44:01 +0000 (21:14 +0530)]
Removed warnings in OptionMenu
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Ia1ab5ddbeee8b0d21796d098ccdfb28e9b354895
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Syed Khaja Moinuddin [Sat, 8 Jun 2013 15:01:05 +0000 (00:01 +0900)]
Merge "Fixed review comments in OptionMenu Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>" into tizen_2.2
Syed Khaja Moinuddin [Sat, 8 Jun 2013 11:50:41 +0000 (17:20 +0530)]
Fixed review comments in OptionMenu
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I2d58e0a232f55761662b44e096fe66b3d7acc33f
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Janardhana Srirama Sarma Kakarla [Sat, 8 Jun 2013 12:05:55 +0000 (21:05 +0900)]
Merge "Fix for Uts failures. Signed-off-by: sriram.k <sriram.k@samsung.com>" into tizen_2.2
sriram.k [Sat, 8 Jun 2013 11:55:23 +0000 (17:25 +0530)]
Fix for Uts failures.
Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: Ic8b8ce1b3720ec335d97db81e5c155a153217262
Chulheon [Sat, 8 Jun 2013 09:53:11 +0000 (18:53 +0900)]
fixed System Value
Change-Id: Ie3d213545119517c7660ea862ee929969ee022e2
Chulheon [Sat, 8 Jun 2013 09:36:48 +0000 (18:36 +0900)]
fixed System Value
Change-Id: Iec41d22e9d6ca703313ea28f2a175a35aa992dd3
Chulheon [Sat, 8 Jun 2013 07:17:23 +0000 (16:17 +0900)]
Merge "Menu Button API CR" into tizen_2.2
Chulheon [Sat, 8 Jun 2013 07:04:12 +0000 (16:04 +0900)]
Menu Button API CR
Change-Id: I05a0258684a19e32bd671906b20330430cdd5def
Suhwan Park [Sat, 8 Jun 2013 06:21:51 +0000 (11:51 +0530)]
Modified bitmap drawing logic on _ListViewItem(N_SE-40563, N_SE-40825)
Change-Id: I69f4e561fc5a429cd05f95b27d30adf06ffa7ffb
Signed-off-by: Suhwan Park <suhwan0927.park@samsung.com>
Choi Munseok [Sat, 8 Jun 2013 02:26:05 +0000 (11:26 +0900)]
Resolved the AppWidgetLayer crash
Change-Id: I7a2afec52d07266dc08860933f3b4d4e21e68347
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Syed Khaja Moinuddin [Fri, 7 Jun 2013 17:09:43 +0000 (22:39 +0530)]
OptionMenu changes to support HW keys.
Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I5c530e26974064f9a874597c73a9f11a3699e817
Poornima Srinivasan [Fri, 7 Jun 2013 13:56:30 +0000 (22:56 +0900)]
Merge "Update doxygen for VPSS-963" into tizen_2.2
Sudha [Fri, 7 Jun 2013 13:50:09 +0000 (19:20 +0530)]
Update doxygen for VPSS-963
Change-Id: I72669ccf305b3802692658e641d0be7123d13653
Signed-off-by: Sudha <sudha.reddy@samsung.com>
Kunal Sinha [Fri, 7 Jun 2013 13:40:43 +0000 (22:40 +0900)]
Merge "Fix for Scroll to cursor Accessibility element" into tizen_2.2
Hyeonmi Kim [Fri, 7 Jun 2013 12:52:39 +0000 (21:52 +0900)]
Merge "Modified N_SE-40706, N_SE-40607." into tizen_2.2
Sudha [Fri, 7 Jun 2013 11:27:56 +0000 (16:57 +0530)]
Fix for VPSS-963
Change-Id: I0baa9c974866d12bb36047fa19b77a92d925655d
Signed-off-by: Sudha <sudha.reddy@samsung.com>
Chulheon [Fri, 7 Jun 2013 11:38:38 +0000 (20:38 +0900)]
Merge "fixed bug (invalid memory access N_SE-40738)" into tizen_2.2
Chulheon [Fri, 7 Jun 2013 11:32:12 +0000 (20:32 +0900)]
fixed bug (invalid memory access N_SE-40738)
Change-Id: Ib377d547489f320db644ae523544de42143243e2
Dae young Ryu [Fri, 7 Jun 2013 10:38:52 +0000 (19:38 +0900)]
fixed bug: crashed by evas_object_image_source_get()
Change-Id: Ie4870172933b8ff6d01d3e991a8431ec81408274
Signed-off-by: Dae young Ryu <karzia@samsung.com>
Hyeonmi Kim [Fri, 7 Jun 2013 09:34:35 +0000 (18:34 +0900)]
Modified N_SE-40706, N_SE-40607.
Change-Id: I085739d43a9c226c639c3518328494e5a0a104b2
Signed-off-by: Hyeonmi Kim <hm_85.kim@samsung.com>
Kang Hee Ju [Fri, 7 Jun 2013 08:39:50 +0000 (17:39 +0900)]
Merge "Fix the mini mode app when the alignment button is pressed" into tizen_2.2
Choi Munseok [Fri, 7 Jun 2013 08:28:39 +0000 (17:28 +0900)]
Fix the mini mode app when the alignment button is pressed
Change-Id: I085a279b304bf9b330d3597266adef1d296d6a54
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Sungyeon Woo [Fri, 7 Jun 2013 08:17:25 +0000 (17:17 +0900)]
fixed drawing bold font bug(P130605-6845)
Change-Id: I9771c435b0a87ce8d6fe54675054e8f781ed2322
Signed-off-by: Sungyeon Woo <s.woo@samsung.com>
Kang Hee Ju [Fri, 7 Jun 2013 07:42:12 +0000 (16:42 +0900)]
Merge "check control's validity after calling public propagated listener, change touch cancel condition" into tizen_2.2
Chulheon [Fri, 7 Jun 2013 07:39:01 +0000 (16:39 +0900)]
Merge "fixed bug and applied PostEvent logic" into tizen_2.2
Chulheon [Fri, 7 Jun 2013 07:33:52 +0000 (16:33 +0900)]
fixed bug and applied PostEvent logic
Change-Id: Ibc23e1dea299d32f19c5871256cd48f328e1bb2b
minkyu kim [Fri, 7 Jun 2013 06:55:19 +0000 (15:55 +0900)]
check control's validity after calling public propagated listener, change touch cancel condition
Change-Id: If090a2228b380d17c026c0ead5889856b14107d1
SangYong Lee [Fri, 7 Jun 2013 06:44:59 +0000 (15:44 +0900)]
Merge " modified focus ui in TableView" into tizen_2.2
minsung [Fri, 7 Jun 2013 11:58:52 +0000 (17:28 +0530)]
modified focus ui in TableView
Change-Id: I7912c4ec15642a6e9c871e6ecb08f8d75ca6095d
Signed-off-by: minsung <minsung.jin@samsung.com>
Kang Hee Ju [Fri, 7 Jun 2013 06:33:09 +0000 (15:33 +0900)]
Merge "Resolve N_SE-40548 & N_SE-40478 : issue for UiBuilder of OverlayPanel" into tizen_2.2
minkyu kim [Fri, 7 Jun 2013 06:26:28 +0000 (15:26 +0900)]
Remove touchCancel condition
Change-Id: I97cbc416283a7bc3c93f8abd5a1548053af03b3b
woo [Fri, 7 Jun 2013 05:49:48 +0000 (14:49 +0900)]
Resolve N_SE-40548 & N_SE-40478 : issue for UiBuilder of OverlayPanel
Change-Id: I974f1c6ca07c3da920eedffcf58391edb2c0a558
Signed-off-by: woo <s-w.woo@samsung.com>
Keuckdo Bang [Fri, 7 Jun 2013 05:10:47 +0000 (14:10 +0900)]
Fixed contenxtmenu bug.
Change-Id: I685711af8728da6671d75577f4441cc560e0bea6
Keuckdo Bang [Fri, 7 Jun 2013 02:24:18 +0000 (11:24 +0900)]
Fixed indicator bug.
Change-Id: I91b827189948b96aea257bc0a6f34cdcbbd2633c
SungHee Kim [Fri, 7 Jun 2013 01:50:24 +0000 (10:50 +0900)]
Merge "Reverting fixed FastScroll." into tizen_2.2
Choi Munseok [Thu, 6 Jun 2013 23:23:52 +0000 (08:23 +0900)]
Fix the duplication in transient_for_set
Change-Id: I40fc46a78bb83c4bd4cfa59876b484015fbb607b
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Kunal Sinha [Thu, 6 Jun 2013 12:41:59 +0000 (18:11 +0530)]
Fix for Scroll to cursor Accessibility element
Change-Id: I568f1c68852f5fb93752c945945ea150bf07ea66
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>
Ayush Srivastava [Thu, 6 Jun 2013 12:37:36 +0000 (21:37 +0900)]
Merge "Fix for N_SE-40699" into tizen_2.2
Kunal Sinha [Thu, 6 Jun 2013 12:25:20 +0000 (21:25 +0900)]
Merge "Fix for Cursor scrolling while FocusUi Change" into tizen_2.2
Ayush [Thu, 6 Jun 2013 12:12:01 +0000 (17:42 +0530)]
Fix for N_SE-40699
Change-Id: I845fc98b94886ac9051ffbd98232fae710d91654
Signed-off-by: Ayush <ayush.sriv@samsung.com>
Kunal Sinha [Thu, 6 Jun 2013 09:32:47 +0000 (15:02 +0530)]
Fix for Cursor scrolling while FocusUi Change
Change-Id: I286639973181c8bef67a70cba1174ed02e1dcf0c
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>
Ayush Srivastava [Thu, 6 Jun 2013 08:48:15 +0000 (17:48 +0900)]
Merge "SB Right Key operation modified" into tizen_2.2
Ayush [Thu, 6 Jun 2013 07:15:10 +0000 (12:45 +0530)]
SB Right Key operation modified
Change-Id: I349504533e30d0a0851a0546c5657a781621a802
Signed-off-by: Ayush <ayush.sriv@samsung.com>
kishorekumar Dachinamoorthy [Thu, 6 Jun 2013 04:39:06 +0000 (10:09 +0530)]
Merging Slider focus ui changes into tizen_2.2.
Change-Id: Ibc9941680e039d37984729678d21923ca405b76d
Choi Munseok [Thu, 6 Jun 2013 00:30:57 +0000 (09:30 +0900)]
Support 4-Direction Rotation on RSA
Change-Id: I54763312c2874f28119841746a25b8e754b8ce9f
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>
Ayush Srivastava [Wed, 5 Jun 2013 18:47:42 +0000 (03:47 +0900)]
Merge "Fix for SB PLM(Focus Not moving to Content)" into tizen_2.2
Ayush [Wed, 5 Jun 2013 18:32:17 +0000 (00:02 +0530)]
Fix for SB PLM(Focus Not moving to Content)
Change-Id: Ief17e6f36cd50432574d929e870764a87e4002fd
Signed-off-by: Ayush <ayush.sriv@samsung.com>
Ayush [Wed, 5 Jun 2013 17:23:33 +0000 (22:53 +0530)]
Fix for JIRA 40541, 40539, 40517, 40511, 40502 and UTs
Change-Id: Ic5495a538ae3f52a69cb2f6b038015207f5534d9
Signed-off-by: Ayush <ayush.sriv@samsung.com>
Ayush Srivastava [Wed, 5 Jun 2013 17:23:14 +0000 (02:23 +0900)]
Merge "Fix for JIRA 40541, 40539, 40517, 40511, 40502 and UTs" into tizen_2.2
Syed Khaja Moinuddin [Wed, 5 Jun 2013 17:18:44 +0000 (02:18 +0900)]
Merge "[Fix for TDIS-5934]Modified UiBuilder related modification for Splitpanel" into tizen_2.2
Saravana Balaji [Wed, 5 Jun 2013 15:01:38 +0000 (00:01 +0900)]
Merge "Fix for TDIS-6016 & 6017" into tizen_2.2
Taejun [Wed, 5 Jun 2013 13:40:06 +0000 (22:40 +0900)]
Fix N_SE-40632
Change-Id: I6e1461c14f02f5741218a037c74bfb9a39acd7ca
Kunal Sinha [Wed, 5 Jun 2013 13:15:29 +0000 (18:45 +0530)]
BG_FOCUS changed to BG_HIGHLIGHTED
Change-Id: I62570aab5c9fbc3d73ece0d25cac76e1276e3021
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>
SungHee Kim [Wed, 5 Jun 2013 07:58:38 +0000 (16:58 +0900)]
Reverting fixed FastScroll.
Change-Id: I76079cecc5ab1fc49a6d7ab2a53df556af31e974
Signed-off-by: SungHee Kim <sh.victoria.kim@samsung.com>
Bhavya Kumili [Wed, 5 Jun 2013 11:50:31 +0000 (17:20 +0530)]
[Fix for TDIS-5934]Modified UiBuilder related modification for Splitpanel
Change-Id: I026f55f61ba8334c9be8b27871e3a0f9699d3377
Saravana Balaji [Wed, 5 Jun 2013 11:21:44 +0000 (16:51 +0530)]
Fix for TDIS-6016 & 6017
Change-Id: I816927326036a979d4d31270e999d424c6290149
Signed-off-by: Saravana Balaji <saravana.bs@samsung.com>
woo [Wed, 5 Jun 2013 10:27:27 +0000 (19:27 +0900)]
Merge "Merge branch 'tizen_2.1' into tizen_2.2" into tizen_2.2
Chulheon [Wed, 5 Jun 2013 10:02:33 +0000 (19:02 +0900)]
fixed bug
Change-Id: Ic755a45f4575d78030f77dcd56111cf96aa0df7d
MinSung Jin [Wed, 5 Jun 2013 05:32:58 +0000 (14:32 +0900)]
modified the condition in TableView RefreshItem for newScrollPosition calculation.
Change-Id: Ic2e7561a585793e330cee507ff03c58f7299b023
Signed-off-by: MinSung Jin <minsung.jin@samsung.com>
woo [Wed, 5 Jun 2013 09:46:11 +0000 (18:46 +0900)]
Merge branch 'tizen_2.1' into tizen_2.2
Change-Id: Ic91b8ab375454313e82807cd279210db551fe500
woo [Wed, 5 Jun 2013 09:29:02 +0000 (18:29 +0900)]
Merge branch 'tizen_2.1' into tizen_2.2
Conflicts:
src/ui/FUi_Control.cpp
src/ui/FUi_EflUiEventManager.cpp
src/ui/controls/FUiCtrl_Edit.cpp
src/ui/inc/FUiCtrl_Edit.h
Change-Id: I2d6dfe0e3de1effaba9edfed2db466fa7f1d23be
JongwooLee [Wed, 5 Jun 2013 09:18:12 +0000 (18:18 +0900)]
Merge "Modified return value of move event for scroll." into tizen_2.2
MinSung Jin [Wed, 5 Jun 2013 09:13:21 +0000 (18:13 +0900)]
Merge "modified the condition in TableView RefreshItem for newScrollPosition calculation." into tizen_2.1
KishoreKumar [Wed, 5 Jun 2013 09:07:00 +0000 (18:07 +0900)]
Merge "Fixing slider disable issue." into tizen_2.1
SungHee Kim [Wed, 5 Jun 2013 09:05:31 +0000 (18:05 +0900)]
Merge "[N_SE-40288] Using same seleting effect for all indexes" into tizen_2.2
clone [Wed, 5 Jun 2013 08:21:40 +0000 (17:21 +0900)]
Merge "Fixed N_SE-38928; removed Show." into tizen_2.1
clone [Wed, 5 Jun 2013 08:21:25 +0000 (17:21 +0900)]
Merge "Changed to use showItemCount for items already added but not to be drawn." into tizen_2.1
Bang Keuck do [Wed, 5 Jun 2013 07:08:20 +0000 (16:08 +0900)]
Merge "Merget form tizen_2.1 branch." into tizen_2.2