Commit Graph

62564 Commits

Author SHA1 Message Date
Jagrut Desai e4ac62b8ee Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev am: 0e5f1af6cb am: d9f09c6768 am: c34c9ccba7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776741

Change-Id: I2f430dc93b839998c6d4c64642080c8f96f4a20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 23:08:27 +00:00
Jagrut Desai a73f20b3fe Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev am: 0e5f1af6cb am: d93ca6726a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776741

Change-Id: I15ae978d9f335175cebc936c489bfc1bc57c2c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:47:28 +00:00
Schneider Victor-tulias 7d14947808 Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev am: a314b0375e am: e5f9c550bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862600

Change-Id: Iff7e5aedc343f515e84caed41998e2e81bd89109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:46:16 +00:00
Andy Wickham 16fd9248d6 Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev am: a4627d2235 am: 5d649671e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22243545

Change-Id: I8800a152a14eb604a5b059c59e72d55110bebb4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:45:50 +00:00
Schneider Victor-tulias 01fab3d01d Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev am: a314b0375e am: b228571904 am: 890aee148a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862600

Change-Id: I402167da0676054332dc300997ce056b027a7411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:43:05 +00:00
Jagrut Desai c34c9ccba7 Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev am: 0e5f1af6cb am: d9f09c6768
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776741

Change-Id: I69437189b6b6d5d4a4f3e39574dd77e3829713e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:37:24 +00:00
Andy Wickham f7bdd01e46 Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev am: a4627d2235 am: d00b5e34f3 am: ee40661f7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22243545

Change-Id: I620b0491fd1c64e9cca3ed2f11b8ac8161fb2a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:34:51 +00:00
Schneider Victor-tulias 890aee148a Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev am: a314b0375e am: b228571904
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862600

Change-Id: If6871927970a7ef95899dd2d8472d44dafe17d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:30:27 +00:00
Andy Wickham ee40661f7b Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev am: a4627d2235 am: d00b5e34f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22243545

Change-Id: I685057806e410bde21823130f5f3b55d6349c634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:30:08 +00:00
Holly Jiuyu Sun a04e2c9420 Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd am: 1783e40dbc am: de6089a2a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: Ib0fb4182e74c5c06b59501e2ef53409ff8c99b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:29:24 +00:00
Jagrut Desai d93ca6726a Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev am: 0e5f1af6cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776741

Change-Id: I3bf39aac51922ebceef7d766e9866a1fbc647234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:29:04 +00:00
Jagrut Desai d9f09c6768 Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev am: 0e5f1af6cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22776741

Change-Id: Id4cb90ca1d5c33372ba541203ea12f5f6e191807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:24:53 +00:00
Holly Jiuyu Sun 7b6b1e4a7d Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd am: bf29b11b65 am: 7f45d21fa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: I5416ed8f4b7514859f387335f45c6a3a9d1c974c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:24:52 +00:00
Jagrut Desai 0e5f1af6cb Merge "Adding Support for Change Navigation Mode Taskbar Divider Menu Option" into udc-dev 2023-04-26 22:12:08 +00:00
Schneider Victor-tulias e5f9c550bd Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev am: a314b0375e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862600

Change-Id: Idc89a36137c56b6b4df20793a8650e9cf2001e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:09:03 +00:00
Andy Wickham 5d649671e7 Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev am: a4627d2235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22243545

Change-Id: I73c6d04586d2e8d44ecab3706939c53e2a258b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:07:50 +00:00
Schneider Victor-tulias b228571904 Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev am: a314b0375e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862600

Change-Id: I11e7c8326a2f10a60e46b96639598625aba8259e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:03:48 +00:00
Andy Wickham d00b5e34f3 Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev am: a4627d2235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22243545

Change-Id: I7f1092a2c0d1f4febb5ed0d04e98bf50cae9f770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 22:03:28 +00:00
Holly Jiuyu Sun de6089a2a3 Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd am: 1783e40dbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: Ie18ddbbed6ec0a3a97fbdf6f76beb1bd31d1515b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:46:56 +00:00
Holly Jiuyu Sun db400e544b Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd am: 187fa0d3d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: I0ecd88148b774e255abe287ca4c2737ab8ef1bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:43:12 +00:00
Holly Jiuyu Sun 7f45d21fa7 Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd am: bf29b11b65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: I8942d2923bdd52b8ebc4c6d69e2f6f3be2dc544c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:42:11 +00:00
Schneider Victor-tulias a314b0375e Merge "Fix broken TaplTestsTaskbar splitscreen test cases" into udc-dev 2023-04-26 21:33:38 +00:00
Andy Wickham a4627d2235 Merge "Add long swipe from app to overview gesture (with flag)." into udc-dev 2023-04-26 21:30:53 +00:00
Holly Jiuyu Sun bf29b11b65 Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: Ife96a54141a8704d69d945847e14f0a57d094a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:06:18 +00:00
Holly Jiuyu Sun 187fa0d3d9 Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: I3e5d0542dcdfb24b266ad786e51ee4e659ea3801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:05:18 +00:00
Holly Jiuyu Sun 1783e40dbc Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev am: 12fa013fcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22723243

Change-Id: I597ccadb1dbc2d62883dcc79371a156331bb4d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 21:01:12 +00:00
Holly Jiuyu Sun 12fa013fcd Merge "[play] Add a new attribute type for GMS Play in order to distinguish with the old M0 flow." into udc-dev 2023-04-26 20:21:29 +00:00
Jordan Silva e63dc440e4 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: b5120a6504 am: 3e2e15f550
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Idec470c0f96866dfd010b491de43c7ca900b92ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 19:44:37 +00:00
Jordan Silva ef68b29a8e Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: de1e2fe58e am: cd04ed3d8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: I952b81353c723b99691f1d79d4d0553b9d57aa9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 19:39:55 +00:00
Jordan Silva 3e2e15f550 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: b5120a6504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: I1058759eb859efe1b0376eada9fe73c1eaede9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:35:25 +00:00
Jordan Silva cd04ed3d8f Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: de1e2fe58e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Ib78a10d2ae822efc49a56142187d6ebf09876f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:29:07 +00:00
Jordan Silva 50a7ef7f16 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c am: 66c4d281c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: If2898fee19a1f34805cefa92a8f091b41c11ec6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:28:58 +00:00
Sebastián Franco d18c6146a8 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: a8fdf98f9a am: 00c464b713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: If3e377cfcd62fb1adc9c25f5964627500a7b2718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:11:26 +00:00
Sebastián Franco ca4de7eba8 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: baac1d9493 am: 9df1423f9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I29ec69850fcef58501c8a3e2f43acce701e3a593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 18:09:00 +00:00
Andy Wickham 830e4b7ce0 Add long swipe from app to overview gesture (with flag).
High level:
 - As you swipe up from an app (OtherActivityInputConsumer),
   a state transition animation to All Apps is created in
   AnimatorControllerWithResistance. The animation is played
   alongside the Recents resistance animation (i.e. past the
   settling point of Overview, which is at mCurrentShift 1).
 - The actual state transition to All Apps only happens if you
   release your finger in the "all apps region." This is set to
   mCurrentShift 2, so double the distance that Overview rests.
 - A haptic plays whenever you enter or exit this region, and
   the all apps animation is set to 0 until the region is
   active. This is so it's clear that something different is
   happening.
 - The panel that was previously used for tablets is now used
   for phones during this transition. It comes in at full
   opacity when you enter the region, and the contents (apps
   and search suggestions) fade in as you continue swiping.
 - The only gesture that is recognized in the all apps region
   is a fling downwards, which will return you to the previous
   app. Otherwise a left/right/up fling or slow release will
   finish the all apps transition.
 - The threshold is ignored if the flag is disabled (default)
   or if FallbackActivityInterface is active.

Flag:
The threshold is ignored if ENABLE_ALL_APPS_FROM_OVERVIEW is
disabled (default).

Bug: 259619990
Bug: 275132633
Test: Manual with and without the flag enabled
Change-Id: Ie311b77252416d97677b2c56fad61dfd392b6fe8
2023-04-26 10:52:04 -07:00
Jordan Silva de1e2fe58e Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Ic9e9190f16283bb2f5248d279341adbc84eef7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:51:11 +00:00
Jordan Silva 66c4d281c9 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Ic137f6cb79c9a4dffc1ed75d6a625b74aaff14be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:51:00 +00:00
Jordan Silva b5120a6504 Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev am: a68cd72a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821459

Change-Id: Idc9ca07f62a1343c83bb306c4e8c3ed43e7e7611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:45:27 +00:00
Sebastián Franco 00c464b713 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: a8fdf98f9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I0730bb7c8841a189ded872941cd8972828b32746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:30:13 +00:00
Sebastián Franco 9df1423f9c Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: baac1d9493
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I3569b178233c3d7bac58f5fbbd87785194165702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:26:52 +00:00
Sebastián Franco 0f669c9863 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10 am: c48be5d6b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I77080888dd485ab26808465d1d615e35a525dc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:25:45 +00:00
Schneider Victor-tulias ccc10128f1 Fix broken TaplTestsTaskbar splitscreen test cases
The split tasks no longer close between test orientation changes. Updating tests to close all tasks after TaplTestsTaskbar test cases

Flag: not needed
Fixes: 279063348
Test: TaplTestsTaskbar
Change-Id: Ie654aae0a16ff495555b48f85a8dec8537086649
2023-04-26 10:15:27 -07:00
Jordan Silva a68cd72a3c Merge "Fix digital wellbeing toast being initialized multiple times" into udc-dev 2023-04-26 17:15:09 +00:00
Sebastián Franco baac1d9493 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: I92385e5184c1cd418310c21eca0bef7dbf9f0a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:47:41 +00:00
Sebastián Franco c48be5d6b0 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: Ie9ce8f91686593d37968bafd77b5306547ffd302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:47:39 +00:00
Sebastián Franco a8fdf98f9a Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev am: 3538deee10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22774999

Change-Id: Ib080b2eab1e020958119972cc34491540a969848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:43:24 +00:00
Sebastián Franco 3538deee10 Merge "Prevent null pointer exception by return from setBackToLauncherCallback when mBackToLauncherCallback is null" into udc-dev 2023-04-26 16:06:35 +00:00
Marcello Galhardo b88d66fac6 Merge "Add custom widget category for Note Taking" into udc-dev am: 0745f507a4 am: e935bf9f22 am: cc0dce13c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21480232

Change-Id: I9ee0cce540bbbbf697938466933980687638c38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:02:56 +00:00
Marcello Galhardo 3d196e6bbc Merge "Add custom widget category for Note Taking" into udc-dev am: 0745f507a4 am: 206811ef6a am: f4815e7392
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21480232

Change-Id: I0cd73452bd807d16420c2f527af05c46ce9684b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:02:09 +00:00
Marcello Galhardo c693978136 Merge "Add custom widget category for Note Taking" into udc-dev am: 0745f507a4 am: ce70d63bd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21480232

Change-Id: I721730692013c978939df5441cf900460b28a052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 15:41:18 +00:00