Jiyun Yang [Wed, 22 Apr 2020 06:19:49 +0000 (15:19 +0900)]
Merge branch 'devel/tizen' into tizen
Jiyun Yang [Wed, 22 Apr 2020 06:19:44 +0000 (15:19 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
a4408c9e8de3401653509f9fea27c5a280a00bf3.
Jiyun Yang [Wed, 22 Apr 2020 05:47:28 +0000 (14:47 +0900)]
DALi Version 1.5.8
Change-Id: Id0821579e3216d4566fe29557b24af5c779689de
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Seoyeon Kim [Tue, 14 Apr 2020 01:53:04 +0000 (10:53 +0900)]
Add Set/GetInputPanelLanguage bindings
Change-Id: Ic484b14efbd9550473fd3f0f361b10d89a7bdf55
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Seoyeon Kim [Mon, 13 Apr 2020 08:10:58 +0000 (17:10 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
5eea541d45abbe2bdc51f635006f9d94c81e2e12.
Change-Id: I9f1e1898a4da07540c92f9cb3f00281317aeb9d5
Seoyeon Kim [Mon, 13 Apr 2020 08:10:33 +0000 (17:10 +0900)]
Merge branch 'devel/tizen' into tizen
Change-Id: I1a0caf757e469e5259aa167847630748f90fa466
Seoyeon Kim [Mon, 13 Apr 2020 08:10:16 +0000 (17:10 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
c5aa3709012caf88deccc9a0f3a99e6337a95c4e.
Change-Id: I1e21ab69eef3682edc3e8ca7fb513b72b0ae9855
Seoyeon Kim [Mon, 13 Apr 2020 04:44:19 +0000 (13:44 +0900)]
DALi Version 1.5.7
Change-Id: I8cfefda786495e1f8098f3f0bd2c9024c429ba93
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Joogab Yun [Mon, 16 Mar 2020 07:45:56 +0000 (16:45 +0900)]
Add NativeImageSource
Change-Id: Ia17eddfd8141742897a298b8f7a137f292673da9
Sunghyun Kim [Tue, 7 Apr 2020 01:17:27 +0000 (10:17 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
3e67d82b765fba12db0c42365cc781512908665d.
Change-Id: I56822eba1abedd94b22e6790afa15150023c3281
Sunghyun Kim [Tue, 7 Apr 2020 01:17:20 +0000 (10:17 +0900)]
Merge branch 'devel/tizen' into tizen
Change-Id: I59f158c386326395e733891acba17ed17171f120
Sunghyun Kim [Tue, 7 Apr 2020 01:17:01 +0000 (10:17 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
c6fa232be7f100b2e2c6d46bd41b3173048e1e25.
Change-Id: I8dfdb1c903fbbb611d8a07d732f40989b48ffcf8
Sunghyun Kim [Mon, 6 Apr 2020 07:36:17 +0000 (16:36 +0900)]
DALi Version 1.5.6
Change-Id: I3b06a21998eff4dcb432a4a1d32afd80a4fe27a2
Seungho, Baek [Wed, 1 Apr 2020 06:12:25 +0000 (15:12 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
179b434f8f6ec01e881aea381c69a16667da40b1.
Seungho, Baek [Wed, 1 Apr 2020 06:12:08 +0000 (15:12 +0900)]
Merge branch 'devel/tizen' into tizen
Seungho, Baek [Wed, 1 Apr 2020 06:12:02 +0000 (15:12 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
7f16a9aa7563c8c45e27429dbd8f68f1c7d0f361.
Seungho, Baek [Wed, 1 Apr 2020 06:11:56 +0000 (15:11 +0900)]
Revert "[Tizen] Add UPDATE_SIZE_HINT property"
This reverts commit
fad8a8ca559e95cd9175505c7323dd7a6c6ea068.
Seungho, Baek [Wed, 1 Apr 2020 05:29:48 +0000 (14:29 +0900)]
DALi Version 1.5.5
Change-Id: I42586929427fefe0ad09d4f1389541864f1f71f2
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
neostom432 [Mon, 23 Mar 2020 09:45:58 +0000 (18:45 +0900)]
[Tizen] Add UPDATE_SIZE_HINT property
This reverts commit
05a6c6833022dc2f6b3d1356b7138bcaa9dbd959.
Change-Id: I5a28ae8a3c4004cc25bd2497c83da04f3889bded
neostom432 [Mon, 23 Mar 2020 09:43:42 +0000 (18:43 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
7249dc165156bb5c480ed36598338c595d90320b.
Change-Id: Ib12e569abbcac7fc191b599372980be2711a9227
neostom432 [Mon, 23 Mar 2020 09:43:25 +0000 (18:43 +0900)]
Merge branch 'devel/tizen' into tizen
neostom432 [Mon, 23 Mar 2020 09:43:17 +0000 (18:43 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
e7165dde48c211b519b364a92b6f91227bc2a0ab.
neostom432 [Mon, 23 Mar 2020 09:15:33 +0000 (18:15 +0900)]
DALi Version 1.5.4
Change-Id: I6380c713082cf339ed6ea44aa8399cb0fb0a1a28
neostom432 [Mon, 23 Mar 2020 07:50:22 +0000 (16:50 +0900)]
Revert "Add UPDATE_SIZE_HINT property"
This reverts commit
9d288034d3b48da3e2f963d538b20e09492b7ecc.
Change-Id: Ia48179ab8156ef655f86e29871ffa8affe2737cb
Dongsug Song [Tue, 17 Mar 2020 01:03:10 +0000 (10:03 +0900)]
Add Window VisibilityChanged Event
Change-Id: Ic8d36888fb457b047181810aee88de5d1a05c571
Joogab Yun [Mon, 16 Mar 2020 08:34:51 +0000 (17:34 +0900)]
Merge branch 'devel/tizen' into tizen
Joogab Yun [Mon, 16 Mar 2020 08:34:19 +0000 (17:34 +0900)]
DALi Version 1.5.3
Change-Id: If902ab4fdeefc5af35506bd6a326b83e5bdc79ca
Wonsik Jung [Tue, 10 Mar 2020 03:59:32 +0000 (12:59 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
498ee501618ef68a73dad6445340425553ae92fb.
Change-Id: I3da7a394b7055c84a6b42e24167b957d3caa3724
Wonsik Jung [Tue, 10 Mar 2020 03:59:20 +0000 (12:59 +0900)]
Merge branch 'devel/tizen' into tizen
Wonsik Jung [Tue, 10 Mar 2020 03:59:07 +0000 (12:59 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
181610e0eb0406ed20bb30d0a9faa400c153bf1e.
Change-Id: Ia2e2fbbadb85fdebf3d2ec032d89d5f40d3c7068
Wonsik Jung [Tue, 10 Mar 2020 03:24:26 +0000 (12:24 +0900)]
DALi Version 1.5.2
Change-Id: I8bacc8533915b02ea12b858e14976cd05ed270f7
Seoyeon Kim [Mon, 2 Mar 2020 06:37:01 +0000 (15:37 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
e8bc54822b47d074fc1e4ec4e71f5ba3a5438974.
Heeyong Song [Mon, 2 Mar 2020 05:46:00 +0000 (14:46 +0900)]
Merge branch 'devel/tizen' into tizen
Change-Id: Id5757daa613920a8f36bafb142933edb208abfa6
Heeyong Song [Mon, 2 Mar 2020 05:45:25 +0000 (14:45 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
80131fad23aa416c9ca44dc8b2b8ce3eacc8d9db.
Change-Id: I2bd3e4531bfb962de3d6128f19fbdac4a98224f2
Heeyong Song [Fri, 28 Feb 2020 05:58:12 +0000 (14:58 +0900)]
DALi Version 1.5.1
Change-Id: Id24ac6f42aca876688fa3ca126752e7941c3d1e5
Jiyun Yang [Tue, 18 Feb 2020 07:35:51 +0000 (16:35 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
e5509d52c3cb703b014ab6db4751023160827eeb.
Change-Id: Ib4644a561967e9f3adb1ab2510ed757e6583f906
Jiyun Yang [Tue, 18 Feb 2020 07:35:35 +0000 (16:35 +0900)]
Merge branch 'devel/master' into tizen
Jiyun Yang [Tue, 18 Feb 2020 07:35:22 +0000 (16:35 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
1bb629982824d5e3ab0c5e6ae5cf4d0a67e4ac6b.
Adeel Kazmi [Fri, 14 Feb 2020 17:11:28 +0000 (17:11 +0000)]
Merge "Use AddChildWithMargin when add child to FlexLayout" into devel/master
Adeel Kazmi [Fri, 14 Feb 2020 07:30:46 +0000 (07:30 +0000)]
DALi Version 1.5.0
Change-Id: I8cc4a0e75ba593669cfa99a67bdec4a5acbce46c
Wonsik Jung [Thu, 2 Jan 2020 02:27:04 +0000 (11:27 +0900)]
Add to set Available Orientations
Add to set Available Orientations.
This API is for adding several orientations one time.
Change-Id: I43d0b5c523160d3ed7e1cca276e05c9f35f663e0
neostom432 [Tue, 11 Feb 2020 03:41:42 +0000 (12:41 +0900)]
Use AddChildWithMargin when add child to FlexLayout
Change-Id: I8f0693e1455f9f5a20908fae6d96c92f4fbe774c
Seoyeon Kim [Wed, 12 Feb 2020 04:56:49 +0000 (13:56 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
d6628f168b2180286f4154e10310ba234f57491e.
Seoyeon Kim [Wed, 12 Feb 2020 04:52:17 +0000 (13:52 +0900)]
Merge branch 'devel/master' into tizen
Seoyeon Kim [Wed, 12 Feb 2020 04:48:49 +0000 (13:48 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
5df5443487ae6944d772765a212c7472f6bf9157.
Dongsug Song [Fri, 7 Feb 2020 01:31:35 +0000 (10:31 +0900)]
Add GetNativePlayerHandle() to pass native player handle upto NUI
Change-Id: I2cee5d6cb21bb4ec728496b9da910d57baf59b22
Signed-off-by: Dongsug Song <dongsug.song@samsung.com>
Anton Obzhirov [Thu, 6 Feb 2020 14:31:50 +0000 (14:31 +0000)]
[dali_1.4.57] Merge branch 'devel/master'
Change-Id: I88c6aa93fdeb76aa1f673fc1f1a75017ad9b5758
Anton Obzhirov [Thu, 6 Feb 2020 14:30:56 +0000 (14:30 +0000)]
DALi Version 1.4.57
Change-Id: Id388a03a878c667f6c4efd1e4430037e39d7d6c2
Sunghyun Kim [Wed, 5 Feb 2020 09:34:40 +0000 (18:34 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
1e8dc6f39d2c710a9e32becbb545904ee39737fa.
Change-Id: Ie113a577fb5cbcbb6255974fff271b31e7aec820
Sunghyun Kim [Wed, 5 Feb 2020 09:34:28 +0000 (18:34 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I7f98ab387907ed6a3436454cd6138acb9e0afff6
Sunghyun Kim [Wed, 5 Feb 2020 09:34:16 +0000 (18:34 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
81ef317910537538172bc16b0e47aa7389770d25.
Change-Id: I30afd8167cb81b96f16dad1f6c95480b5ed25712
Sunghyun Kim [Wed, 5 Feb 2020 09:34:05 +0000 (18:34 +0900)]
Revert "[Tizen] Add to get current window orientation."
This reverts commit
28f6d75a9d16e98a86aea2360825c0afaa60f111.
Change-Id: I28ddff3b11eb8c4dc2e26d3d76a7e09b8ad62cd6
adam.b [Fri, 31 Jan 2020 11:14:18 +0000 (11:14 +0000)]
[dali_1.4.56] Merge branch 'devel/master'
Change-Id: Ie759c02a7d3393f83293c199059cf8035701c788
adam.b [Fri, 31 Jan 2020 11:13:23 +0000 (11:13 +0000)]
DALi Version 1.4.56
Change-Id: Ia2fc1e8e2f155e23bbd61fba00bf806cb920a136
Adeel Kazmi [Fri, 24 Jan 2020 16:25:51 +0000 (16:25 +0000)]
Merge "Add to get current window orientation." into devel/master
Victor Cebollada [Fri, 24 Jan 2020 13:50:41 +0000 (13:50 +0000)]
[dali_1.4.55] Merge branch 'devel/master'
Change-Id: I52e854a720b5cc0a66eeb885f1647fd2d189017d
Victor Cebollada [Fri, 24 Jan 2020 13:49:56 +0000 (13:49 +0000)]
DALi Version 1.4.55
Change-Id: I91121a034bf145daed5742778cf365a338ec043f
Seungho, Baek [Tue, 21 Jan 2020 08:37:11 +0000 (17:37 +0900)]
[Tizen] Add to get current window orientation.
This reverts commit
c1fc60c6b5086675dcc16c1a66cc87f566492cae.
Seungho, Baek [Tue, 21 Jan 2020 08:36:58 +0000 (17:36 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
aea5f61d4cebc645a8628ce9f26eebda20028be8.
Seungho, Baek [Tue, 21 Jan 2020 08:36:50 +0000 (17:36 +0900)]
Merge branch 'devel/master' into tizen
Seungho, Baek [Tue, 21 Jan 2020 08:36:33 +0000 (17:36 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
195ac9c74da6ab309a2f46887a964b213b902086.
Seungho, Baek [Tue, 21 Jan 2020 08:36:31 +0000 (17:36 +0900)]
Revert "[Tizen] Add to get current window orientation."
This reverts commit
cd30701d6de7aa193fd3ff6d43ebb6f23c550b01.
Seungho, Baek [Tue, 21 Jan 2020 08:36:29 +0000 (17:36 +0900)]
Revert "Revert "(ATSPI) Add ATSPI for Say(), Pause(), Resume(), SetForcefully(), GetStatus()""
This reverts commit
1865e04474d3a0a8988442efb8edfef9541dfd0b.
György Straub [Fri, 17 Jan 2020 08:49:45 +0000 (08:49 +0000)]
[dali_1.4.54] Merge branch 'devel/master'
Change-Id: Ie85b07c983d1463079e8c04820035f3b36426103
György Straub [Fri, 17 Jan 2020 08:49:01 +0000 (08:49 +0000)]
DALi Version 1.4.54
Change-Id: Iffc5065cd815285883dd235613b32e9cebff4c8b
greynaga [Fri, 10 Jan 2020 11:51:23 +0000 (11:51 +0000)]
[dali_1.4.53] Merge branch 'devel/master'
Change-Id: I4eaf24327feba79eeb7c09d37b9afc76f50e9aeb
greynaga [Fri, 10 Jan 2020 11:50:38 +0000 (11:50 +0000)]
DALi Version 1.4.53
Change-Id: Ibdbfe0f53401de533e46bdd552b670ff1c5f60d2
Richard Huang [Fri, 3 Jan 2020 11:07:55 +0000 (11:07 +0000)]
[dali_1.4.52] Merge branch 'devel/master'
Change-Id: Id8ea5fe237d38aa1b1625530a2b89bc0840914af
Richard Huang [Fri, 3 Jan 2020 11:07:08 +0000 (11:07 +0000)]
DALi Version 1.4.52
Change-Id: I3274d2a5c1c14ea1118686174bdecb09927d9382
Wonsik Jung [Fri, 27 Dec 2019 08:49:02 +0000 (17:49 +0900)]
Add to get current window orientation.
Add the API to get current window orientation.
It is to return the logical orientation
Change-Id: Iae7433f24cc3b0cff9705a618ac1da7edb2bb197
Joogab Yun [Fri, 27 Dec 2019 09:54:53 +0000 (18:54 +0900)]
Revert "(ATSPI) Add ATSPI for Say(), Pause(), Resume(), SetForcefully(), GetStatus()"
This reverts commit
a11aeccc61fb39ce24b3dae7cc09f9bf8f1ae5c7.
Joogab Yun [Fri, 27 Dec 2019 09:41:41 +0000 (18:41 +0900)]
[Tizen] Add to get current window orientation.
This reverts commit
08a8c4b6efcb2a36c0b26cc62b15d7462f138c6e.
Change-Id: Ib633f9a34b8c538ea76db56b80808e6e303d0171
Joogab Yun [Fri, 27 Dec 2019 09:41:22 +0000 (18:41 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
7875c753d859c7ac3dee532c7a67a2e70e6daec5.
Change-Id: If9cf894ab46627e865e31459b7788fc34f00c118
Joogab Yun [Fri, 27 Dec 2019 09:41:08 +0000 (18:41 +0900)]
Merge branch 'devel/master' into tizen
Joogab Yun [Fri, 27 Dec 2019 09:41:02 +0000 (18:41 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
5225b678cf656e85273af91bb57dc8d1334bd977.
Joogab Yun [Fri, 27 Dec 2019 09:40:59 +0000 (18:40 +0900)]
Revert "[Tizen] Add to get current window orientation."
This reverts commit
458356c5d7f56c79eb6f84030fee32c8203aa453.
Wonsik Jung [Fri, 27 Dec 2019 08:49:02 +0000 (17:49 +0900)]
[Tizen] Add to get current window orientation.
Add the API to get current window orientation.
It is to return the logical orientation
Change-Id: Iae7433f24cc3b0cff9705a618ac1da7edb2bb197
Jiyun Yang [Fri, 27 Dec 2019 08:35:51 +0000 (17:35 +0900)]
Fix build warnings
Change-Id: Ied6051b4cdaf13351561bb7ac5334bdbad50d47e
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Wed, 18 Dec 2019 07:52:05 +0000 (16:52 +0900)]
Add binding code for SHADOW enum in ControlDevel and PropertyMap operator[]
Change-Id: Idb9ea3ea795ad774cad1c4154a3fa8be514efada
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Adeel Kazmi [Fri, 20 Dec 2019 16:57:08 +0000 (16:57 +0000)]
Merge "(ATSPI) Add ATSPI for Say(), Pause(), Resume(), SetForcefully(), GetStatus()" into devel/master
Cheng-Shiun Tsai [Fri, 20 Dec 2019 10:34:14 +0000 (10:34 +0000)]
[dali_1.4.51] Merge branch 'devel/master'
Change-Id: Id31ccb26373d7aa0168744643bd2ccba870acf32
Cheng-Shiun Tsai [Fri, 20 Dec 2019 10:33:20 +0000 (10:33 +0000)]
DALi Version 1.4.51
Change-Id: Ia7d04687a697969a19b63998922db19765ee5632
Wonsik Jung [Thu, 19 Dec 2019 06:25:36 +0000 (15:25 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
4451f38a963330e6a733647bcc757b0af879c51f.
Wonsik Jung [Thu, 19 Dec 2019 06:24:16 +0000 (15:24 +0900)]
Merge branch 'devel/master' into tizen
Wonsik Jung [Thu, 19 Dec 2019 06:23:52 +0000 (15:23 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
14d353754ad21cf909bfa366406d5165c740d14d.
dongsug.song [Wed, 16 Oct 2019 04:19:17 +0000 (13:19 +0900)]
(ATSPI) Add ATSPI for Say(), Pause(), Resume(), SetForcefully(), GetStatus()
This reverts commit
4ca314623f0a4ec3f60deace83ad572e4c597752.
Change-Id: I0257c05a0002a7d14a6eb7792026998455b26e4c
Agnelo Vaz [Fri, 13 Dec 2019 10:58:43 +0000 (10:58 +0000)]
[dali_1.4.50] Merge branch 'devel/master'
Change-Id: I95062327b4a1b52181bedc8ad9e10cc2a561d36b
Agnelo Vaz [Fri, 13 Dec 2019 10:57:44 +0000 (10:57 +0000)]
DALi Version 1.4.50
Change-Id: Ifa29a75ed900c04cc553b65cf7268639d1fef5c0
Anton Obzhirov [Thu, 5 Dec 2019 11:54:54 +0000 (11:54 +0000)]
[dali_1.4.49] Merge branch 'devel/master'
Change-Id: I1497e2f462722d7c945a9af4640fdb083a53106d
Anton Obzhirov [Thu, 5 Dec 2019 11:53:51 +0000 (11:53 +0000)]
DALi Version 1.4.49
Change-Id: I4317979122812fd31aab56ff61f0fabb5f4645fb
huiyu.eun [Mon, 2 Dec 2019 07:44:27 +0000 (16:44 +0900)]
Binding VideoView::New with swCodec parameter
Change-Id: I4359f7dc9219330000abff9c2658455f11477507
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Wonsik Jung [Mon, 2 Dec 2019 05:52:42 +0000 (14:52 +0900)]
[Tizen] Add AutofillContainer and bindings
This reverts commit
92291af52310a72a694c4f7f1548770cf44b5233.
Wonsik Jung [Mon, 2 Dec 2019 05:52:29 +0000 (14:52 +0900)]
Merge branch 'devel/master' into tizen
Wonsik Jung [Mon, 2 Dec 2019 05:52:06 +0000 (14:52 +0900)]
Revert "[Tizen] Add AutofillContainer and bindings"
This reverts commit
5b9b42f8c081ffb9da2b38c085507b82cb63a5a5.
adam.b [Fri, 29 Nov 2019 12:18:10 +0000 (12:18 +0000)]
[dali_1.4.48] Merge branch 'devel/master'
Change-Id: I18d3a0e15f593c596a197aaf28bb0e1e1b4bd040
adam.b [Fri, 29 Nov 2019 12:17:25 +0000 (12:17 +0000)]
DALi Version 1.4.48
Change-Id: I1d1b6c87bf4d2e20a23355345beefe4aea089ebb
Victor Cebollada [Fri, 22 Nov 2019 07:15:28 +0000 (07:15 +0000)]
[dali_1.4.47] Merge branch 'devel/master'
Change-Id: I38aba0ed3046ff8a0487f4066bb2b7f91f6d702c
Victor Cebollada [Fri, 22 Nov 2019 07:14:41 +0000 (07:14 +0000)]
DALi Version 1.4.47
Change-Id: I6bb67c0d1c6192d9714b9f934aca38b55b4a2971
Heeyong Song [Wed, 20 Nov 2019 09:15:38 +0000 (18:15 +0900)]
[Tizen] Add AutofillContainer and bindings
Change-Id: Ie525903c1e0be250f8fa421167e11a09028acb79
Heeyong Song [Wed, 20 Nov 2019 09:15:25 +0000 (18:15 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I60d5039205b7f3ea9c33b00ff0211be95f51d478