Commit Graph

58436 Commits

Author SHA1 Message Date
Schneider Victor-tulias 5df1968595 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 3019939c93 am: 5b06002027
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I5b8e557722445d4c10e9931de726a8760b81f3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 19:41:29 +00:00
Alex Chau 8a7617f168 Merge "Fix slow page animations on large devices" into tm-dev 2022-05-12 19:08:41 +00:00
Pat Manning 33066a5743 Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 0826ae1e6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: Iff802b2663952e6931695b21b926e9f395422682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:50:46 +00:00
Pat Manning 8909fc2dcb Merge "Update drop target button alignment across devices." into tm-dev 2022-05-12 18:41:54 +00:00
Brian Isganitis de0c8c7c1b Merge "Ignore swipe velocity if next task is considered the destination." into tm-dev 2022-05-12 18:40:51 +00:00
Pat Manning b0df1525cb Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece am: 1954aadb31 am: 22ec9f84cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: Ic12373607f86e093ce9ffcd2c7a0fcbc68467aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:39:39 +00:00
Alex Chau 33c5d5bb8c Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981 am: 0c2a5f4ccb am: 437559a7b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: Id5acdb475b033fce29760e9dfc26813bec72003c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:39:29 +00:00
Schneider Victor-tulias d317725081 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 3019939c93 am: c1b05052dd am: 7deb182676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I3a3b0bad29b27064f4d129b1d24121bca68e3dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:39:21 +00:00
Sunny Goyal 25bba074da Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 3416df65a9 am: efb0b716af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I7ea61ca00e38fd209092d8d019fa2cd8bcc1e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:36:57 +00:00
James O'Leary f5a2edabb3 Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: b5e3d80bae am: 59639781cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: I879cfe95ec2ecd5d0ea0a273818aa872954549a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:36:32 +00:00
Pat Manning 22ec9f84cd Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece am: 1954aadb31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: I62f0c9b8fc96bb1f2448bb95d8b537633810d92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:32:23 +00:00
Alex Chau 437559a7b8 Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981 am: 0c2a5f4ccb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I9f0cef42fb3f708d56a7b24f8a16472f0aa6c576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:32:14 +00:00
James O'Leary fe435ad44e Update app icon shadows
Allow use of white shadow, set radius to 1.0 and offset to 0.
Use 100% and 20% alpha, instead of 70% and 50%.
(nets out to same effect)
Make ambient and key shadows equivalent: there are deterministic
formulas for what contrast a shadow will create, and those formulas
were used for the spec. Ad-hoc attempts to try to increase visibility
are no longer needed and don't align with design intent

Bug: 213314628
Test: Manual inspection at runtime
Change-Id: Ie12d3d05488e16fea94e91be16c25448f450a44d
2022-05-12 18:28:39 +00:00
Sunny Goyal e42cb401a2 Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 3416df65a9 am: 4bde7798cb am: f557f88400
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I52ea439be5eb0b5bec93fa209811c162fcaab2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:22:23 +00:00
James O'Leary 0155243117 Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: b5e3d80bae am: ebc88fc926 am: 4822ad1011
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: I5ca095982dc08732f8da951b071e6ff9d4bdf5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:21:27 +00:00
Pat Manning 0172b588ad Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece am: c5d45a589b am: 0bda95949b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: Ica2e450e6600b1c93f712e6c71a7ec5918409930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:21:08 +00:00
Alex Chau 5da178b7d9 Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981 am: 7c700439ee am: f6cfb34f7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I37d600945fd10bcf4b59a4b31ed16d7f1a59e67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:20:56 +00:00
Schneider Victor-tulias d56a646e07 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 062f5573dd am: 9cf1cd177d am: ef6714ad47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: Ic2d68ad00c80315f603108284912b7111dca5caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:20:48 +00:00
Schneider Victor-tulias 7deb182676 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 3019939c93 am: c1b05052dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I79b0db503e097d2aafb76d31d149b7bb5f251038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:19:38 +00:00
Tracy Zhou f14d58dfda Merge "Tune dragToFolder test so that it works with the new nav bar height" into tm-dev 2022-05-12 18:17:19 +00:00
Sunny Goyal f557f88400 Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 3416df65a9 am: 4bde7798cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I94334685d4072ae5876831ddd1a3434ef069e37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:06:17 +00:00
James O'Leary 4822ad1011 Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: b5e3d80bae am: ebc88fc926
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: If81343c73f6c9e73c5f4b0993b314f940448adca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:06:01 +00:00
Sunny Goyal c9b5ed37d1 Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 69d342abbf am: dda9a84367 am: 161888c2fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I36b15192ddd89203bc37e671b73c472ffb956636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:05:24 +00:00
Schneider Victor-tulias 5b06002027 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 3019939c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I9e9ef723eba276d97839596445a9e09aa680e426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:04:48 +00:00
James O'Leary e6f26b125f Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: 2cc50ce11c am: 12e2082583 am: 8ac9e4b65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: Id828266c81f80d39e58849ed0113de53dac5998f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:04:47 +00:00
Sunny Goyal efb0b716af Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 3416df65a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I5f0a45c44108ad3da26daa61825eafbb0d616de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:04:34 +00:00
Alex Chau 9a22cfb308 Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: a1ef38ac62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I25a9950380a0899c51c782fce6c3ad0972b6231c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:04:03 +00:00
Schneider Victor-tulias c1b05052dd Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 3019939c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I51def4efdfa988bd92c63aac626e8bad7bf0d06c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:03:08 +00:00
James O'Leary 59639781cf Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: b5e3d80bae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: Iba6f98e7bd595ed2c15c7f86828c3aeb29a7dc64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:52 +00:00
Pat Manning 0bda95949b Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece am: c5d45a589b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: I76e6626ce42213592c72da6b0d0ad167317645b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:39 +00:00
Alex Chau f6cfb34f7b Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981 am: 7c700439ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I30d7b81a383abf1cfd987116555d2d2084dc3811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:30 +00:00
Pat Manning 1954aadb31 Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: I1b185017b29711591329583af21573cf28cace7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:26 +00:00
Sunny Goyal 4bde7798cb Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 3416df65a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I5317ed153a43d5411ddeb55e0ebe4ec8ae3a0b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:18 +00:00
Alex Chau 0c2a5f4ccb Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: Ic311b5c8c3fd1f050f509e2671f9cd2ac106a8f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:01:54 +00:00
James O'Leary ebc88fc926 Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: b5e3d80bae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: I640ddf0e06757bb5d14b2b045908319ccaec4e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:01:48 +00:00
Schneider Victor-tulias ef6714ad47 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047 am: 062f5573dd am: 9cf1cd177d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I6e04a0e01debcbc629a8e58c03ef9315e6d7e8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:01:33 +00:00
Pat Manning c5d45a589b Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 37fd65dece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: I2b3e5d38f806ce1564d7332252e757a0c50d18a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:01:27 +00:00
Alex Chau 7c700439ee Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 54962bc981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: Ie60931562ed24a2aad604c6a064bbc92148b3fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:01:17 +00:00
Sunny Goyal 161888c2fa Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d am: 69d342abbf am: dda9a84367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I188957a6d8cf980af4f7e2cd41a6cfabbb75e578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:58:39 +00:00
Pat Manning 2d1fda3b9f Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 0c1347ceff am: 25f9f045ff am: a046ec4a33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: I80aa65d27a366965e1f798177cd027064f2be9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:57:08 +00:00
Alex Chau dc3c36f725 Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 8ade327cc4 am: 1d78c653b2 am: a377c0208f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I5404309520e5da9764e9875e782715a4b29b0354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:56:55 +00:00
Schneider Victor-tulias 3019939c93 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: I3bbb0f012d74f62e61a4e07878b48d4a529eb7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:47:06 +00:00
Sunny Goyal 3416df65a9 Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I974c6daf39a523982f2c5d7aa1c796e2252ad8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:42:43 +00:00
Schneider Victor-tulias 195ccb3698 Merge "Removing redundant waiting for window change event and adding debug logging for dragging and dropping." into tm-dev am: d4909d3047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206592

Change-Id: Iad8ccfa59a19f0415cc1f30ffbd8b4af8c891d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:38:22 +00:00
Sunny Goyal 0a5f364785 Merge "Adding support for easily extending Launcher DragAndDrop support" into tm-dev am: d7281d097d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18287509

Change-Id: I0c07c70e64764cd76e456824be38ac4964bc9bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:34:14 +00:00
James O'Leary 7eaeff28d6 Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: Iba0d8d4deebbe23e711984435efdb95025fb6586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:31:10 +00:00
James O'Leary 8ac9e4b65b Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56 am: 2cc50ce11c am: 12e2082583
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: Idca42657ce3a2fbb084c8cee9c74906b7d28e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:18:30 +00:00
James O'Leary b5e3d80bae Merge "Separate color into app color and dot color; specify dot color" into tm-dev am: 508fbbff56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167227

Change-Id: I61ba9bca0254b0a0152c590dc19fdda5e3e14442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:17:37 +00:00
Pat Manning a046ec4a33 Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev am: a54d1ab24a am: 0c1347ceff am: 25f9f045ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18280942

Change-Id: Ia60d755fb3bc51c855782fcbef3c14d7c511caff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:17:35 +00:00
Alex Chau a377c0208f Merge "Tune overview icon size and paddings" into tm-dev am: f4c8da6263 am: 8ade327cc4 am: 1d78c653b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18231547

Change-Id: I0da9997d833391af5d8c0e9d8c6d412a303bc138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:17:21 +00:00