framework/uifw/elementary.git
13 years agoMerge "[elm_ts]Test case build errors are corrected in navigation bar_ex."
sumanth [Wed, 11 May 2011 05:32:23 +0000 (14:32 +0900)]
Merge "[elm_ts]Test case build errors are corrected in navigation bar_ex."

13 years agoMerge "[multibuttonentry] TC modify: wrong testcase Change-Id: I19c42418ca3bb5364fa76...
deasung.kim [Wed, 11 May 2011 05:11:46 +0000 (14:11 +0900)]
Merge "[multibuttonentry] TC modify: wrong testcase Change-Id: I19c42418ca3bb5364fa76bbf67931b770c92d018"

13 years agoMerge "Fixed UTC execution errors for Popup and Navigationbar"
Rajeev Ranjan [Wed, 11 May 2011 05:11:40 +0000 (14:11 +0900)]
Merge "Fixed UTC execution errors for Popup and Navigationbar"

13 years agoMerge "[TC/bubble] Removed bubble from TC build."
Daniel Juyung Seo [Wed, 11 May 2011 05:02:01 +0000 (14:02 +0900)]
Merge "[TC/bubble] Removed bubble from TC build."

13 years agoMerge "[TC/genlist] Code refactoring. Fixed indentation. Removed trailing whitespaces."
Daniel Juyung Seo [Wed, 11 May 2011 05:01:57 +0000 (14:01 +0900)]
Merge "[TC/genlist] Code refactoring. Fixed indentation. Removed trailing whitespaces."

13 years agoMerge "[TC/genlist] Fixed genlist TC."
Daniel Juyung Seo [Wed, 11 May 2011 05:01:53 +0000 (14:01 +0900)]
Merge "[TC/genlist] Fixed genlist TC."

13 years agoMerge "[Genlist] Fixed unnecessary 'realized' and 'unrealized' callback call. Upstrea...
Daniel Juyung Seo [Wed, 11 May 2011 04:56:59 +0000 (13:56 +0900)]
Merge "[Genlist] Fixed unnecessary 'realized' and 'unrealized' callback call. Upstream merge."

13 years agoMerge "[.gitignore] Upstream merge."
Daniel Juyung Seo [Wed, 11 May 2011 04:56:55 +0000 (13:56 +0900)]
Merge "[.gitignore] Upstream merge."

13 years ago[TC/bubble] Removed bubble from TC build.
Daniel Juyung Seo [Wed, 11 May 2011 04:44:18 +0000 (13:44 +0900)]
[TC/bubble] Removed bubble from TC build.

13 years ago[TC/genlist] Code refactoring. Fixed indentation. Removed trailing whitespaces.
Daniel Juyung Seo [Wed, 11 May 2011 04:41:05 +0000 (13:41 +0900)]
[TC/genlist] Code refactoring. Fixed indentation. Removed trailing whitespaces.

13 years ago[TC/genlist] Fixed genlist TC.
Daniel Juyung Seo [Wed, 11 May 2011 04:04:25 +0000 (13:04 +0900)]
[TC/genlist] Fixed genlist TC.

13 years agoMerge "[TC] change TC Makefile in controlbar, scroller"
Jaehwan Kim [Wed, 11 May 2011 03:06:25 +0000 (12:06 +0900)]
Merge "[TC] change TC Makefile in controlbar, scroller"

13 years ago[multibuttonentry] TC modify: wrong testcase
deasung.kim [Wed, 11 May 2011 00:54:50 +0000 (09:54 +0900)]
[multibuttonentry] TC modify: wrong testcase
Change-Id: I19c42418ca3bb5364fa76bbf67931b770c92d018

13 years ago[elm_ts]Test case build errors are corrected in navigation bar_ex.
sumanth [Tue, 10 May 2011 15:12:59 +0000 (20:42 +0530)]
[elm_ts]Test case build errors are corrected in navigation bar_ex.

Change-Id: I8f643359a98b6f5868199a83a97b3548ccdc6da9

13 years agoFixed UTC execution errors for Popup and Navigationbar
Rajeev Ranjan [Tue, 10 May 2011 14:57:40 +0000 (20:27 +0530)]
Fixed UTC execution errors for Popup and Navigationbar

Change-Id: I7cb160ea669d6176428de4cd9903ee1bd99ac2c9

13 years agoMerge "changelog / repackaging"
chuneon.park [Mon, 9 May 2011 08:37:27 +0000 (17:37 +0900)]
Merge "changelog / repackaging"

13 years agochangelog / repackaging
chuneon.park [Mon, 9 May 2011 08:37:06 +0000 (17:37 +0900)]
changelog / repackaging

13 years agoMerge "fixe event blocking problem"
chuneon.park [Mon, 9 May 2011 08:35:26 +0000 (17:35 +0900)]
Merge "fixe event blocking problem"

13 years agofixe event blocking problem
chuneon.park [Mon, 9 May 2011 08:14:55 +0000 (17:14 +0900)]
fixe event blocking problem

13 years agoMerge "[default.edc] Slider's default style is merged with os svn code (ver-59225)."
Rajeev Ranjan [Mon, 9 May 2011 04:33:24 +0000 (13:33 +0900)]
Merge "[default.edc] Slider's default style is merged with os svn code (ver-59225)."

13 years agoMerge "[elm_popup]Code refactoring for standardization and cleanup."
Rajeev Ranjan [Mon, 9 May 2011 04:33:05 +0000 (13:33 +0900)]
Merge "[elm_popup]Code refactoring for standardization and cleanup."

13 years ago[Genlist] Fixed unnecessary 'realized' and 'unrealized' callback call. Upstream merge.
Daniel Juyung Seo [Sun, 8 May 2011 08:26:50 +0000 (17:26 +0900)]
[Genlist] Fixed unnecessary 'realized' and 'unrealized' callback call. Upstream merge.

13 years ago[.gitignore] Upstream merge.
Daniel Juyung Seo [Sun, 8 May 2011 07:54:56 +0000 (16:54 +0900)]
[.gitignore] Upstream merge.

13 years ago[Genlist] Fixed item disabled set bug. Upstream Merge.
Daniel Juyung Seo [Fri, 6 May 2011 03:01:34 +0000 (12:01 +0900)]
[Genlist] Fixed item disabled set bug. Upstream Merge.

13 years ago[default.edc] Slider's default style is merged with os svn code (ver-59225).
sumanth [Thu, 5 May 2011 20:30:33 +0000 (02:00 +0530)]
[default.edc] Slider's default style is merged with os svn code (ver-59225).

Change-Id: Ie5d8a3c8dc446a5f01d6e9500890375d06d808d9

13 years ago[TC] change TC Makefile in controlbar, scroller
Jaehwan Kim [Thu, 5 May 2011 04:46:45 +0000 (13:46 +0900)]
[TC] change TC Makefile in controlbar, scroller

13 years agoMerge "[multibuttonentry] bugfix: multibuttonentry label get / TC_Fail Change-Id...
deasung.kim [Wed, 4 May 2011 11:28:00 +0000 (20:28 +0900)]
Merge "[multibuttonentry] bugfix: multibuttonentry label get / TC_Fail Change-Id: I5a9c552b7875baa7029c43dfb30bda395be95ec8"

13 years agoPackage upload
Jaehwan Kim [Wed, 4 May 2011 10:11:23 +0000 (19:11 +0900)]
Package upload

13 years ago[multibuttonentry] bugfix: multibuttonentry label get / TC_Fail
deasung.kim [Wed, 4 May 2011 09:01:59 +0000 (18:01 +0900)]
[multibuttonentry] bugfix: multibuttonentry label get / TC_Fail
Change-Id: I5a9c552b7875baa7029c43dfb30bda395be95ec8

13 years ago[elm_popup]Code refactoring for standardization and cleanup.
Rajeev Ranjan [Mon, 2 May 2011 13:28:57 +0000 (18:58 +0530)]
[elm_popup]Code refactoring for standardization and cleanup.

Change-Id: I398f5beb7cac6e60e850fd32dc64e45265c320a9

13 years agoRemove the deprecated stackedicon test suite from SE Lab's execution.
Myoungwoon Kim [Wed, 4 May 2011 06:08:18 +0000 (15:08 +0900)]
Remove the deprecated stackedicon test suite from SE Lab's execution.

Change-Id: I5fd2d75454dc54dc66a1182b65a8e2f698d7b2d7

13 years agoMerge "[Genlist] Removed warnings."
Daniel Juyung Seo [Wed, 4 May 2011 05:08:08 +0000 (14:08 +0900)]
Merge "[Genlist] Removed warnings."

13 years ago[scroller] bug fix - cannot scroll while genlist items are loaded
Jaehwan Kim [Mon, 2 May 2011 12:15:27 +0000 (21:15 +0900)]
[scroller] bug fix - cannot scroll while genlist items are loaded

Change-Id: I7751bb8c1733baf35ae67b4209e6e60cd3053781

13 years agoMerge "[els_scroller] bouncing animation for acceleration"
Jaehwan Kim [Wed, 4 May 2011 03:04:08 +0000 (12:04 +0900)]
Merge "[els_scroller] bouncing animation for acceleration"

13 years ago[Genlist] Removed warnings.
Daniel Juyung Seo [Wed, 4 May 2011 02:30:32 +0000 (11:30 +0900)]
[Genlist] Removed warnings.

13 years agoPackage upload
Daniel Juyung Seo [Wed, 4 May 2011 02:20:46 +0000 (11:20 +0900)]
Package upload

13 years ago[Elementary.h.in] Removed trailing whitespaces.
Daniel Juyung Seo [Wed, 4 May 2011 01:58:27 +0000 (10:58 +0900)]
[Elementary.h.in] Removed trailing whitespaces.

13 years agoElm_util : merge with upstream (58795)
WooHyun Jung [Tue, 3 May 2011 14:23:37 +0000 (23:23 +0900)]
Elm_util : merge with upstream (58795)

13 years agoMerge "[Elm_COnformant] CQ H0100125039 Fixed. On each resizing of conformant area...
Prince Kr Dubey [Tue, 3 May 2011 07:53:08 +0000 (16:53 +0900)]
Merge "[Elm_COnformant] CQ H0100125039 Fixed. On each resizing of conformant area, show region was incremented which was false. Text name changed as per review."

13 years agoMerge "[TickerNoti] CQ:H0100126265 fixed. Detail:Any value of angle input is converte...
Prince Kr Dubey [Tue, 3 May 2011 05:26:38 +0000 (14:26 +0900)]
Merge "[TickerNoti] CQ:H0100126265 fixed. Detail:Any value of angle input is converted to 0 to 360 degree."

13 years agoMerge "After app-core fixed the issue about remaining app's callback funcs, Activate...
Myoungwoon Kim [Tue, 3 May 2011 03:07:13 +0000 (12:07 +0900)]
Merge "After app-core fixed the issue about remaining app's callback funcs, Activate _elm_win_shutdown()."

13 years agoMerge "[Bug fix]Removed add callback in del_button_item()"
Goun Lee [Tue, 3 May 2011 01:55:52 +0000 (10:55 +0900)]
Merge "[Bug fix]Removed add callback in del_button_item()"

13 years agoMerge "Change button text to utf8 Change-Id: I8d3dcc244f477fd4ddb2815a144fad10465d9e1c"
Goun Lee [Tue, 3 May 2011 01:54:39 +0000 (10:54 +0900)]
Merge "Change button text to utf8 Change-Id: I8d3dcc244f477fd4ddb2815a144fad10465d9e1c"

13 years ago[Bug fix]Removed add callback in del_button_item()
Goun Lee [Tue, 3 May 2011 01:35:46 +0000 (10:35 +0900)]
[Bug fix]Removed add callback in del_button_item()

13 years ago[TickerNoti] CQ:H0100126265 fixed. Detail:Any value of angle input is
Prince Kr Dubey [Mon, 2 May 2011 11:30:58 +0000 (17:00 +0530)]
[TickerNoti] CQ:H0100126265 fixed. Detail:Any value of angle input is
converted to 0 to 360 degree.

Change-Id: I52dbf5dd05a1622d43429667694b0f9bb65cdbf7

13 years agoMerge "deprecate elm_dialoguegroup, elm_bubble_sweep_layout_xxx (samsung added apis...
Sohyun Kim [Mon, 2 May 2011 11:34:17 +0000 (20:34 +0900)]
Merge "deprecate elm_dialoguegroup, elm_bubble_sweep_layout_xxx (samsung added apis only) Change-Id: Id102937ca01604acd3ebc14997097f26471d2196"

13 years agoChange button text to utf8
Goun Lee [Mon, 2 May 2011 07:50:52 +0000 (16:50 +0900)]
Change button text to utf8
Change-Id: I8d3dcc244f477fd4ddb2815a144fad10465d9e1c

13 years agoMerge "elm_gengrid calc_job bug fixed"
JeongHyun Yun [Mon, 2 May 2011 08:41:52 +0000 (17:41 +0900)]
Merge "elm_gengrid calc_job bug fixed"

13 years agoMerge "[upstream merge] Elementary map: change evas_object_line (route) to evas_objec...
sangho park [Mon, 2 May 2011 08:30:35 +0000 (17:30 +0900)]
Merge "[upstream merge] Elementary map: change evas_object_line (route) to evas_object_polygon"

13 years ago[els_scroller] bouncing animation for acceleration
Jaehwan Kim [Mon, 2 May 2011 06:32:13 +0000 (15:32 +0900)]
[els_scroller] bouncing animation for acceleration

13 years agodeprecate elm_dialoguegroup, elm_bubble_sweep_layout_xxx (samsung added apis only)
Sohyun Kim [Mon, 2 May 2011 04:54:31 +0000 (13:54 +0900)]
deprecate elm_dialoguegroup, elm_bubble_sweep_layout_xxx (samsung added apis only)
Change-Id: Id102937ca01604acd3ebc14997097f26471d2196

13 years agoPackage upload
Jaehwan Kim [Mon, 2 May 2011 02:52:55 +0000 (11:52 +0900)]
Package upload

Change-Id: Iee12e03e5dddbd1afe66a62680d785804cd95fdd

13 years ago[genlist] expandable effect rollback
Jaehwan Kim [Mon, 2 May 2011 02:47:43 +0000 (11:47 +0900)]
[genlist] expandable effect rollback

13 years agoAfter app-core fixed the issue about remaining app's callback funcs, Activate _elm_wi...
Myoungwoon Kim [Mon, 2 May 2011 00:54:20 +0000 (09:54 +0900)]
After app-core fixed the issue about remaining app's callback funcs, Activate _elm_win_shutdown().

Change-Id: I72c5a50444bb2782d432e7059658eff7658950f4

13 years agorepackaging
chuneon.park [Sun, 1 May 2011 07:54:34 +0000 (16:54 +0900)]
repackaging

13 years agotransit - added one more exception handling.
chuneon.park [Sun, 1 May 2011 07:52:13 +0000 (16:52 +0900)]
transit - added one more exception handling.

13 years agoPackage upload
WooHyun Jung [Sat, 30 Apr 2011 01:36:47 +0000 (10:36 +0900)]
Package upload

13 years agoMerge "optimize for item add, delete performance"
Myoungwoon Roy Kim [Fri, 29 Apr 2011 15:17:36 +0000 (00:17 +0900)]
Merge "optimize for item add, delete performance"

13 years agoEls_icon : rollback about preload
WooHyun Jung [Fri, 29 Apr 2011 12:11:18 +0000 (21:11 +0900)]
Els_icon : rollback about preload
Change-Id: Id46ccf0900ce2e4549182763435ec3c6da82bfa4

13 years ago[Elm_COnformant] CQ H0100125039 Fixed. On each resizing of conformant area, show...
Prince Kr Dubey [Wed, 27 Apr 2011 06:42:57 +0000 (12:12 +0530)]
[Elm_COnformant] CQ H0100125039 Fixed. On each resizing of conformant area, show region was incremented which was false. Text name changed as per
review.

Change-Id: I1e3ce9582c45768ec0d75218e8e454d2e8f98138

13 years agoelm_gengrid calc_job bug fixed
JeongHyun Yun [Fri, 29 Apr 2011 10:51:35 +0000 (19:51 +0900)]
elm_gengrid calc_job bug fixed

13 years agoMerge "[genlist] change expandable effect"
Jaehwan Kim [Fri, 29 Apr 2011 08:32:01 +0000 (17:32 +0900)]
Merge "[genlist] change expandable effect"

13 years ago[upstream merge] Elementary map: change evas_object_line (route) to evas_object_polygon
sangho park [Fri, 29 Apr 2011 01:24:05 +0000 (10:24 +0900)]
[upstream merge] Elementary map: change evas_object_line (route) to evas_object_polygon

Change-Id: I9e5f99cf3a0ff2fda934818d2f04dc7f34c68dfd

13 years agoMerge "Elm_Entry : Fix bug of password_last_char_chow"
WooHyun Jung [Fri, 29 Apr 2011 01:43:03 +0000 (10:43 +0900)]
Merge "Elm_Entry : Fix bug of password_last_char_chow"

13 years agotransit - updated TC
chuneon.park [Thu, 28 Apr 2011 14:05:02 +0000 (23:05 +0900)]
transit - updated TC

13 years agoElm_Entry : Fix bug of password_last_char_chow
WooHyun Jung [Thu, 28 Apr 2011 10:46:47 +0000 (19:46 +0900)]
Elm_Entry : Fix bug of password_last_char_chow

13 years agoupstream merge
sangho park [Thu, 28 Apr 2011 08:50:05 +0000 (17:50 +0900)]
upstream merge

Change-Id: I20ca8959b68d1487ec9210040f46c1a26461d603

13 years agoPackage upload
Myoungwoon Kim [Thu, 28 Apr 2011 05:50:27 +0000 (14:50 +0900)]
Package upload

13 years agoRemove #error "ERROR. Compile aborted." for customized widgets.
Myoungwoon Kim [Thu, 28 Apr 2011 05:45:04 +0000 (14:45 +0900)]
Remove #error "ERROR. Compile aborted." for customized widgets.

Change-Id: I8b1061262966b9f44f8b098c01639105d10ad3e9

13 years agoMerge "[elm_map] upstream merge"
sangho park [Thu, 28 Apr 2011 00:31:53 +0000 (09:31 +0900)]
Merge "[elm_map] upstream merge"

13 years ago[genlist] change expandable effect
Jaehwan Kim [Wed, 27 Apr 2011 10:29:46 +0000 (19:29 +0900)]
[genlist] change expandable effect

Change-Id: Iff6ac11ec05687ab3f6351de5abdc11725993336

13 years agoPackage upload
Myoungwoon Kim [Wed, 27 Apr 2011 09:51:45 +0000 (18:51 +0900)]
Package upload

13 years agoTextdomain should only be used for applications not libs.
Myoungwoon Kim [Wed, 27 Apr 2011 09:09:40 +0000 (18:09 +0900)]
Textdomain should only be used for applications not libs.

Change-Id: I7108db6fa04cc6752a0a7c996a4fc80b6f016d5b

13 years agoPackage upload
Daniel Juyung Seo [Wed, 27 Apr 2011 06:34:11 +0000 (15:34 +0900)]
Package upload

13 years agoMerge "[Genlist] Upstream merge. Added genlist mode feature. This feature is used...
Daniel Juyung Seo [Wed, 27 Apr 2011 06:32:34 +0000 (15:32 +0900)]
Merge "[Genlist] Upstream merge. Added genlist mode feature. This feature is used as a sweep in SLP."

13 years ago[elm_map] upstream merge
sangho park [Wed, 27 Apr 2011 06:30:23 +0000 (15:30 +0900)]
[elm_map] upstream merge

Change-Id: Id12e6a2578ac82602916209cbb6a3f8df05eeab6

13 years ago[store] Fix the crash problem after store free quickly many times
Yun ilkook [Wed, 27 Apr 2011 06:21:29 +0000 (15:21 +0900)]
[store] Fix the crash problem after store free quickly many times

Change-Id: Ifa483034760bd25103f1336e69cee6f76392d677

13 years ago[Genlist] Upstream merge. Added genlist mode feature. This feature is used as a sweep...
Daniel Juyung Seo [Wed, 27 Apr 2011 06:18:59 +0000 (15:18 +0900)]
[Genlist] Upstream merge. Added genlist mode feature. This feature is used as a sweep in SLP.

13 years agomerged elm_transit with EFL community
chuneon.park [Wed, 27 Apr 2011 05:11:07 +0000 (14:11 +0900)]
merged elm_transit with EFL community

13 years agoPackage upload
Jaehwan Kim [Tue, 26 Apr 2011 09:37:25 +0000 (18:37 +0900)]
Package upload

13 years agooptimize for item add, delete performance
deasung.kim [Tue, 26 Apr 2011 08:52:40 +0000 (17:52 +0900)]
optimize for item add, delete performance

13 years agoPackage upload
Jaehwan Kim [Tue, 26 Apr 2011 07:04:45 +0000 (16:04 +0900)]
Package upload

Change-Id: Ifdb588d5678fb604d337d7ffcdef519f5beedf80

13 years ago[genlist] expandable effect bug fix
Jaehwan Kim [Tue, 26 Apr 2011 06:42:24 +0000 (15:42 +0900)]
[genlist] expandable effect bug fix

Change-Id: I2fe34586eca07071ea83068c2c71c6d993790d64

13 years agoadd libelm.postinst
Jaehwan Kim [Tue, 26 Apr 2011 06:38:37 +0000 (15:38 +0900)]
add libelm.postinst

13 years agoPackage upload
Myoungwoon Kim [Tue, 26 Apr 2011 04:42:16 +0000 (13:42 +0900)]
Package upload

13 years ago[Genlist] Added 'const' to elm_genlist_realized_items_get() API.
Daniel Juyung Seo [Tue, 26 Apr 2011 04:32:47 +0000 (13:32 +0900)]
[Genlist] Added 'const' to elm_genlist_realized_items_get() API.

13 years agoChange the arguement type from Evas_Object to const Evas_Object.
Myoungwoon Kim [Tue, 26 Apr 2011 03:00:25 +0000 (12:00 +0900)]
Change the arguement type from Evas_Object to const Evas_Object.

Change-Id: I32503fc06a356d5a6d5c835d3277261c3df15c67

13 years agoElementary migration around 2011/04/06
Jaehwan Kim [Mon, 25 Apr 2011 13:40:47 +0000 (22:40 +0900)]
Elementary migration around 2011/04/06

13 years agochangelog - repackaging
chuneon.park [Mon, 25 Apr 2011 13:09:46 +0000 (22:09 +0900)]
changelog - repackaging

13 years agonavigationbar - fixed button style set
chuneon.park [Mon, 25 Apr 2011 12:58:09 +0000 (21:58 +0900)]
navigationbar - fixed button style set

13 years agoMerge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
chuneon.park [Mon, 25 Apr 2011 04:59:08 +0000 (13:59 +0900)]
Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary

13 years agoMerge "elementary/navigationbar - refacatoring 7,8"
chuneon.park [Mon, 25 Apr 2011 04:58:41 +0000 (13:58 +0900)]
Merge "elementary/navigationbar - refacatoring 7,8"

13 years agoMerge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary
chuneon.park [Fri, 22 Apr 2011 06:11:13 +0000 (15:11 +0900)]
Merge branch 'master' of 165.213.180.234:/slp/pkgs/e/elementary

13 years agoPackage Upload
Shinwoo Kim [Fri, 22 Apr 2011 05:59:31 +0000 (14:59 +0900)]
Package Upload

13 years agoelementary/navigationbar - refacatoring 7,8
chuneon.park [Fri, 22 Apr 2011 05:43:57 +0000 (14:43 +0900)]
elementary/navigationbar - refacatoring 7,8

13 years ago[diskselector] merge with opensource
Shinwoo Kim [Fri, 8 Apr 2011 05:37:41 +0000 (14:37 +0900)]
[diskselector] merge with opensource

Change-Id: I4b080c56fde192e1aa1ac5f87d1779f33747fc0f

13 years ago[store] add and fix the APIs of backing store for a item free and sort
Yun ilkook [Fri, 22 Apr 2011 01:34:42 +0000 (10:34 +0900)]
[store] add and fix the APIs of backing store for a item free and sort

Change-Id: Ia32e1bc52ef9cd462c7974d25a08026ca59d1db5

13 years agoPackage upload
WooHyun Jung [Thu, 21 Apr 2011 12:21:43 +0000 (21:21 +0900)]
Package upload

13 years agoElm_util : bug fix in _elm_util_mkup_to_utf9
WooHyun Jung [Thu, 21 Apr 2011 12:07:34 +0000 (21:07 +0900)]
Elm_util : bug fix in _elm_util_mkup_to_utf9

13 years agoupstream merge
sangho park [Thu, 21 Apr 2011 09:29:55 +0000 (18:29 +0900)]
upstream merge

Change-Id: I924f4acd78a3fb70fa7d88733742787108eaee11