Commit Graph

83004 Commits

Author SHA1 Message Date
Hui Kang 8e2f266dff Remove IwTest annotation.
Bug: 286084672
Test: presubmit
Change-Id: Ib110688344d3ca209c8955de596fc5528f725f6d
2023-06-15 14:21:05 -07:00
Bill Yi 8b917df3e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1399b459f -s ours am: c70e41a431 -s ours am: 79cf5f906c -s ours am: 95a8ff28ed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23669872

Change-Id: I85c65cef753074107c0960bedae18527fcc4fbcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 21:11:49 +00:00
Lucas Dupin 33ea8d7615 Merge "Merge "Fixing color mismatch for Launcher3/NexusLauncher" into udc-dev am: d469ce2460 am: e3f46ba90b" into udc-qpr-dev am: fbe96507dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23674271

Change-Id: I114af60768612d5c873e62a8458b76b13be7de3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:50:56 +00:00
Bill Yi 95a8ff28ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1399b459f -s ours am: c70e41a431 -s ours am: 79cf5f906c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23669872

Change-Id: Ibce3a8cf03cfdfd4ea3616d552a21463f37ec6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:46:52 +00:00
Lucas Dupin fbe96507dd Merge "Merge "Fixing color mismatch for Launcher3/NexusLauncher" into udc-dev am: d469ce2460 am: e3f46ba90b" into udc-qpr-dev 2023-06-15 20:15:11 +00:00
Sunny Goyal 96ef57a263 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: fd40444673 -s ours am: 38b885d669 -s ours am: a517e7fdae -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ie830da47b75fed89809fedfeeeb03f30f7f78b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:02:13 +00:00
Sunny Goyal 8e77486733 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: aae6bea754 -s ours am: 84a6006647 -s ours am: ad15ee7519 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I8470720750bc0b9e6c72a3aee2f6c0ff05c2fd4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:02:00 +00:00
Sunny Goyal e531aa4c44 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb am: bcdd3ff60e -s ours am: 47d180fc86 -s ours am: 65868a4e89 -s ours am: 332059c213 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ic4e52af1553aa5d04d2073201a786824bb34e0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:01:06 +00:00
Andrew Cole 2174841c5a Merge "Turning back on flaky test" into udc-qpr-dev am: ae13341187 am: d3bf928805
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697821

Change-Id: I230fd349f2858d3ed03ce13f1cd788fe0547502f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:00:07 +00:00
Vinit Nayak ae6beea07b Add logs to RemoteTargetGluer for index exception
Bug: 286144914
Change-Id: I16a8d22a281903574c282b08c06695e4f0e46168
2023-06-15 19:38:37 +00:00
Sunny Goyal a517e7fdae [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: fd40444673 -s ours am: 38b885d669 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I9d09a16fac1901a43f6f16b203500a9aa7392f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:37:08 +00:00
Sunny Goyal ad15ee7519 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: aae6bea754 -s ours am: 84a6006647 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I10915884f13be28a23bf1dd6a82d594eb267fe37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:36:31 +00:00
Sunny Goyal 332059c213 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb am: bcdd3ff60e -s ours am: 47d180fc86 -s ours am: 65868a4e89 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I6035dd88a8cc98241b514d034a10f3770a5fbc9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:36:00 +00:00
Sunny Goyal 41a0add773 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: a53e7143dd -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I6726a987493693c7c7a50166c5f9245228d8d3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:35:49 +00:00
Sunny Goyal 26ac5e20eb [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: 08272eea01 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ieb615378677e0bc2d577d0a0cbeae7ce7e316a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:33:05 +00:00
Sunny Goyal 38b885d669 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: fd40444673 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: If71549f35a4b200b161576cfb2aa6eb1ea8e4848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:33:04 +00:00
Andrew Cole d3bf928805 Merge "Turning back on flaky test" into udc-qpr-dev am: ae13341187
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697821

Change-Id: Iaf6800b63cf3437167ab68913e581cf6e0ac498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 19:16:44 +00:00
Sunny Goyal 84a6006647 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours am: aae6bea754 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I5e68f2fda55dccd37f2435689791c73f0da8cfb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:53:24 +00:00
Sunny Goyal 65868a4e89 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb am: bcdd3ff60e -s ours am: 47d180fc86 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Iad5e074f9520ceef3af4b0bdc8687c39d7cdbc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:53:15 +00:00
Sunny Goyal fd40444673 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ibb3774483fac4044f28634514d2687ef5c02f951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:52:48 +00:00
Sunny Goyal 08272eea01 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ie206b4f08084579ef0e065624422b506101a9762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:52:41 +00:00
Sunny Goyal a53e7143dd [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I59f366b09590f9bdcb5b0b2aeedcaf26fa0766d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:52:27 +00:00
Sunny Goyal aae6bea754 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours am: 0171c356c6 -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: Ia8e56f102a964f1f5d5747671df15546290427ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:48:21 +00:00
Vadim Tryshev 6bcc1ed352 Merge "Moving ViewCaptureRule to inside of FailureWatcher" into udc-qpr-dev am: 2b23dcb094 am: a28604accb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23698242

Change-Id: Ib0b3b784a78acf0ad897623027dea0e1b1806d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:30:29 +00:00
Federico Baron 363e5e5150 Merge "Fix padding/margin for widgets in widgetpicker" into udc-qpr-dev am: d7eb90c4b7 am: a34bd09bca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23696295

Change-Id: I1da269ca3cd6dcba45def1d7d2718354e8eee707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:28:39 +00:00
Andrew Cole ae13341187 Merge "Turning back on flaky test" into udc-qpr-dev 2023-06-15 18:23:38 +00:00
Liran Binyamin 3e94d52732 Fade the bubble bar arrow in and out when the bubble bar expands and collapses.
Demo: http://recall/-/bJtug1HhvXkkeA4MQvIaiP/hKhpM98JZe1gT8bwtYkNeW

Bug: 280604480
Test: Tested on a physical device
Change-Id: Iaee9aeb0a8c1e2bd61816964e4cae5f7bea926ff
2023-06-15 18:07:54 +00:00
Sunny Goyal 0171c356c6 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I146c785b52eae77eae784c9fa10612b71b644226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:05:40 +00:00
Sunny Goyal 47d180fc86 [automerger skipped] Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb am: bcdd3ff60e -s ours
am skip reason: skipped by user sunnygoyal

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I050a9398bed5df655e8585b5542c9d8e5f011e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 18:05:38 +00:00
Schneider Victor-tulias 8ab395c445 Remove TIS command line arg handling
These args did not have much usage and only complicate the code.

Flag: not needed
Fixes: 287306282
Test: dumped TIS logs
Change-Id: Iafc07723345d8ddbe15f7ca280579f6b42d5c3b6
2023-06-15 17:55:11 +00:00
Vadim Tryshev a28604accb Merge "Moving ViewCaptureRule to inside of FailureWatcher" into udc-qpr-dev am: 2b23dcb094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23698242

Change-Id: I03e66d5b0e3e1a5e32a78e22f4b96879a6a57f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 17:47:15 +00:00
Federico Baron a34bd09bca Merge "Fix padding/margin for widgets in widgetpicker" into udc-qpr-dev am: d7eb90c4b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23696295

Change-Id: I95f7fb4c13760832a667992ba941167b0068bc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 17:47:02 +00:00
Liran Binyamin 35b1f38403 Animate the bubble bar width and the bubbles within it as it expands and collapses.
Fixes: 280604480
Test: Tested on a physical device
Change-Id: I76587cf6ba97700b49c902d42cf4db5f7f3a7152
2023-06-15 17:39:20 +00:00
Vadim Tryshev 2b23dcb094 Merge "Moving ViewCaptureRule to inside of FailureWatcher" into udc-qpr-dev 2023-06-15 17:05:20 +00:00
Sunny Goyal bcdd3ff60e Merge changes from topic "icon-thrashing" into tm-qpr-dev am: f2d09fe4cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23554146

Change-Id: I633bf5ed14eded2693d25297d2e24a3f3a8d9275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 16:34:28 +00:00
Federico Baron d7eb90c4b7 Merge "Fix padding/margin for widgets in widgetpicker" into udc-qpr-dev 2023-06-15 16:32:28 +00:00
Sunny Goyal f2d09fe4cb Merge changes from topic "icon-thrashing" into tm-qpr-dev
* changes:
  Fixing syntax error due to java-version changes
  Fixing icon cache thrashing due to an unsupported icon
2023-06-15 15:55:51 +00:00
Andrew Cole eddc230d71 Turning back on flaky test
Because of a fix that has been merged here ag/23680187 this test should also be able to be turned on and not become flakey.

Bug: 256615483
Test: testUninstallFromWorkspace
Change-Id: I7096f5e9392ddedf1c4c2ab23b922b352bb5d7b1
2023-06-15 08:12:28 -07:00
Winson Chung de9d242698 Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: 2ab58bccb8 am: 66e109f0dd am: f37ff460a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: I23a1b72ce6bbb42eaa1122cb4fde02a31487cc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:22:33 +00:00
Winson Chung f8be98c718 Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: f2433f39eb am: d220609b63 am: ba3eb3171f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: Ic3eda9907f02c58402afb978fb9ba79efd43561f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:20:17 +00:00
Winson Chung f37ff460a6 Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: 2ab58bccb8 am: 66e109f0dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: Ia7bdc121b2076db3a32ca86c7824b9e668e3df91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:32:36 +00:00
Winson Chung ba3eb3171f Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: f2433f39eb am: d220609b63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: I8f1b1fdf75161e78033729e2b5a77c13cbe1004c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:29:44 +00:00
Winson Chung 66e109f0dd Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: 2ab58bccb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: Ib0391bd3541c0c1e72ce7722062350f56522de6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 05:48:26 +00:00
Winson Chung c3a97765c8 Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: c0b89e9810
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: I29dcd5bb32698eb49d57984aa818525fedf1ef19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 05:44:01 +00:00
Winson Chung d220609b63 Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: f2433f39eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: I044cb0c3c771c6eb1d3f4f5d6d425c1eb03e7909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 05:43:51 +00:00
Winson Chung 6ebe88b17f Merge "Reset the static preloaded icon result once launcher is hidden" into udc-dev am: 7cd608594b am: f6549f01d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23697218

Change-Id: Ifab4538ea98881bf4a683b5a30da9dfe30eb8585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 05:43:47 +00:00
Android Build Coastguard Worker 5339f7e44b Merge cherrypicks of ['googleplex-android-review.googlesource.com/23695536', 'googleplex-android-review.googlesource.com/23695537'] into udc-qpr1-release.
Change-Id: I12dbb02daa5251df6cf8f9e91b6212c1256e24d0
2023-06-15 04:51:43 +00:00
Neha Jain 996bfae0b2 Revert "Put the "floating" in ENABLE_FLOATING_SEARCH_BAR."
Revert submission 23624636-draglayer-inline-qsb

Reason for revert: b/287172381

Reverted changes: /q/submissionid:23624636-draglayer-inline-qsb
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:92784b5bf646e2fd872f693839319849d08659d2)
Merged-In: Ie4f9606baa724f543f034e0d5ca7ac4aa07bf747
Change-Id: Ie4f9606baa724f543f034e0d5ca7ac4aa07bf747
2023-06-15 04:51:14 +00:00
Neha Jain 7a87d59813 Revert "Allow LauncherState to define floating search side margins."
Revert submission 23624636-draglayer-inline-qsb

Reason for revert: b/287172381

Reverted changes: /q/submissionid:23624636-draglayer-inline-qsb
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5b5d01d7242d1867f24b130b61d10e6a7985fec1)
Merged-In: I818c8aba5e0c10938e101fc369c887da82ab259c
Change-Id: I818c8aba5e0c10938e101fc369c887da82ab259c
2023-06-15 04:51:08 +00:00
Jon Miranda 34d62290fa Merge "Fade in/out taskbar bg alpha when unstash/stashing." into udc-dev am: 613cc95c8a am: 8b1160e484 am: 33d293a21a am: b6a02345dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23696768

Change-Id: Ia39a0ce62c84bdd236f2b4dc7dd3136d0942e70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 04:48:59 +00:00