PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

78507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot beb741a2cf Merge "Enable ENABLE_DYNAMIC_TASKBAR_THRESHOLDS." into udc-qpr-dev am: 7af0db7e94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24464350

Change-Id: I0e2af8d123efbb857a7e17860a1eaec76f19ec8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 19:11:32 +00:00
Mateusz Cicheński 79b7a17444 Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev am: 4573658e7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447708

Change-Id: I2ea5dd40e06ba72ae556984320bef4e940d3f56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 19:10:45 +00:00
Treehugger Robot 7af0db7e94 Merge "Enable ENABLE_DYNAMIC_TASKBAR_THRESHOLDS." into udc-qpr-dev 2023-08-17 18:49:51 +00:00
Mateusz Cicheński 4573658e7b Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev 2023-08-17 18:27:21 +00:00
fbaron c7a605ea82 Fix page indicator bugs for foldable 
There are bugs when unfolding the felix device where the page indicator will appear in the wrong place, and have to animate all the way back to where it should go. Here we fix those issues.

Fix: 294229186
Fix: 294231977
Flag: no flag
Test: n/a
Change-Id: I962042efcee6fcea2e46acd585b7f1403078b548
 2023-08-17 10:58:15 -07:00
Vadim Tryshev 9e1fbcbe52 Implementing detector of view position jumps 
I.e. when a view's top, right, left or bottom jumps too far between frames.

Flag: N/A
Test: presubmit, local runs
Bug: 286251603
Change-Id: I8f75a5b9ebb213d56db9f9ba1cc31d398fe7e88f
 2023-08-17 10:55:40 -07:00
Federico Baron e8fb6d826b Revert "Add logs for widget picker image test" 
This reverts commit 575a6ef5f8.

Reason for revert: we no longer need the logs since we're going to ignore widget picker image test in UDC-QPR and leave it on in main where it's already not failing

Change-Id: Ib132c9df710031d291d0254fe4bb0acdfeb3f863
 2023-08-17 16:20:56 +00:00
Jordan Silva d92271849c Fix hotseat border space crash GSI 
Fix the calculation of the space between the icons for hotseat when the number of spaces needed is 0 or less.

Fix: 285834082
Flag: N/A
Test: HotseatWidthCalculationTest
Change-Id: I73bc1950277c01ac0ae7202c1e08bf45266b59b8
 2023-08-17 16:02:01 +01:00
Jon Miranda 0605413a30 Enable ENABLE_DYNAMIC_TASKBAR_THRESHOLDS. 
Bug: 274467454
Test: manual, has been soaking in teamfood

Change-Id: I2729ed3c4f93ef5a4e8e1769802931e1c6b80708
 2023-08-17 07:48:03 -07:00
Treehugger Robot 5ee523c331 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c5e716dd17 am: 8ff5c3b0e0 am: 1ffcd98fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ic12312761ac084547012b3f92978894ed7f6204a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 14:22:57 +00:00
Treehugger Robot 1400a357d4 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 4ae4cf973c am: 625bef7f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I65b97b8ba67f0a10438325d270d7ed6c35631499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 14:22:08 +00:00
Treehugger Robot d5b5ded5e1 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 73c3611b32 am: 0c1255ea21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I6da3a24c603d52b548a014780d37489c570d7f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 14:11:51 +00:00
Wei Sheng Shih cf08b8cbb7 Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32 am: e457c6d5bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24458447

Change-Id: Idb897b9eabffe5467b600aae17a51747f806495d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:41:56 +00:00
Automerger Merge Worker f2b99a2414 Merge changes from topic "am-6d926cc1120a4e26b7760ee02d80c529" into main 
* changes:
  Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev am: d07d83dd75 am: acbb0869da
  Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev am: e09f34628e am: d145973e68
 2023-08-17 13:26:18 +00:00
Vinit Nayak 46f90d2bf0 Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev am: d07d83dd75 am: acbb0869da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447374

Change-Id: I5badb01e70e93b7e5f18ca92105dbdedec8ba7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:26:11 +00:00
Vinit Nayak 310ddd5c7d Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev am: e09f34628e am: d145973e68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24445218

Change-Id: I862ef08fd1a13efc6a3dc366e278fd03d23d81db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:26:08 +00:00
Treehugger Robot 7f7836f1fd Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c4b806d54e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I65713d6ab1b98715caf06a0e48232a91093bbfad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 13:26:07 +00:00
Pat Manning 39521ce7a5 Add test to dismiss AllApps by swipe up to home gesture. 
Fix: 292080259
Test: TaplTestsLauncher3
Change-Id: I6053078cbfaf37d26c11376aecd21ba4edcbba44
 2023-08-17 12:25:41 +01:00
Treehugger Robot 1ffcd98fbb Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c5e716dd17 am: 8ff5c3b0e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ic0f5bd1d333307d8a3df821d89e5ddf282dd1051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 08:20:50 +00:00
Treehugger Robot 625bef7f3f Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 4ae4cf973c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I0baa7a55a229712822880d20938225ba9420b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 08:20:13 +00:00
Treehugger Robot 0c1255ea21 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d am: 73c3611b32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I5d98b20266fcae1fb3eed38da4b62a684ebeed89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 07:57:56 +00:00
Treehugger Robot 73c3611b32 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Iaff03a09ac0bc4f208554f994db3995d60b42893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 07:37:19 +00:00
Treehugger Robot 8ff5c3b0e0 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: c5e716dd17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I7abf0f2a314e439793293b976af880eb36dcbe8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 07:36:32 +00:00
Treehugger Robot 4ae4cf973c Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 am: e841687a7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ic43435c66c9f6e95d03b8d6734ab84783448969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 07:36:21 +00:00
Treehugger Robot c5e716dd17 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I30f820d6d29c7a30c8fd3ca361ee9048812f5f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 06:50:55 +00:00
Treehugger Robot c4b806d54e Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: I771c1e7f05edd57bd88b714bd864404152914b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 06:50:28 +00:00
Wei Sheng Shih e457c6d5bb Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24458447

Change-Id: I3eeafd70e622d6696ac82a7d4ae16a1e748d8dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 06:46:24 +00:00
Treehugger Robot e841687a7d Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev am: d756203fa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24314473

Change-Id: Ieef8d4827efbd137c13066fb07f3ef0f75a0e625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 06:45:47 +00:00
Wei Sheng Shih e6866f3f32 Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev 2023-08-17 06:34:03 +00:00
Treehugger Robot d756203fa7 Merge "Fix return condition in getWorkspacePageTranslationProvider" into udc-dev 2023-08-17 05:42:09 +00:00
Vinit Nayak acbb0869da Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev am: d07d83dd75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447374

Change-Id: I4828f0081e965ec929c96808862a677efb8563b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 05:40:02 +00:00
Vinit Nayak d145973e68 Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev am: e09f34628e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24445218

Change-Id: I39619a5e894b2e0e0eaafc2e89656b66099b7e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 05:40:00 +00:00
Vinit Nayak d07d83dd75 Merge "Revert "Enable ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE for TEAMFOOD"" into udc-qpr-dev 2023-08-17 05:04:53 +00:00
Vinit Nayak e09f34628e Merge "Revert "Teamfood ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS"" into udc-qpr-dev 2023-08-17 05:04:53 +00:00
wilsonshih 6df52eb6f9 Fix NPE crash when using MockProperties 
Override the setShow method in MockProperties as it is used for invalid
surface.

Bug: 295775097
Test: build
Change-Id: Id601fa3ce7408f236c77e41ccd60b7d8359c2e8c
 2023-08-17 12:09:33 +08:00
Sunny Goyal 7aae0c0dbc Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev am: c480860744 am: 746613f591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448719

Change-Id: I841d0643f3fe93f3987e7115cd2f471cf8236f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:58:54 +00:00
Treehugger Robot 3ce5780c8e Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev am: 12cd6076d3 am: f4bbe54f97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447385

Change-Id: I5fb63b2525906979f061ecbd838509da719a8768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:32:07 +00:00
Treehugger Robot 4394f426fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours am: b921628b87 -s ours am: 9f0e4cc93b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecae6c18bfebafb147b57bc9ba3052a492bb033d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:45 +00:00
Bill Yi e75fd485e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours am: 2253e31378 -s ours am: 79f4e118c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f8947d3658a79ac62a0fad2c6b5e9d3ac867448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:33 +00:00
Bill Yi 4f12b57041 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours am: c439e24a3a -s ours am: 3c3f681569 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3c00d4f669590585d71076c87afefcbb7ae9431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:26:19 +00:00
Bill Yi 8cc663774e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours am: ff8a5c791a -s ours am: 196a90eb02 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id00c6a1d1faa7c84abd5f731c6f57e77053a5084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:21:29 +00:00
Treehugger Robot 08c374262f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 52baf1783b -s ours am: 67463ba8ef -s ours am: 6cae99a4fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0feaf1f6532a5bbdade84401572798c5bd8f4c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:34 +00:00
Bill Yi cc93057fd0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: b4b14bf48a -s ours am: b79fa567c5 -s ours am: 93d0754c4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3338ab166e0d0aa7576b284e7a81427518e98f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:25 +00:00
Bill Yi a677921506 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 0bfd828001 -s ours am: a164e77c32 -s ours am: cc24359f86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide12a9d0e339977f30af1f765cd389e3ab61825f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:17:08 +00:00
Charlie Anderson 8ae165864f Merge "add logging for Launcher backup and restore events" into udc-qpr-dev am: 8a68138995 am: a9b0249faa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24310674

Change-Id: Ib3d3b8b78d30514261e904557db9b02bcc4e9e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:16:33 +00:00
Treehugger Robot fece08210a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 06677beec0 -s ours am: 472a589ab4 -s ours am: dc371661b7 -s ours am: fc43c9adb5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5faf3f9c001c5d8b72cf7bfcc248c1f674dd3cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:38 +00:00
Bill Yi a918e7cde5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdbc1a0cf -s ours am: bd6c8ab2a4 -s ours am: ad92c8f9ec -s ours am: 47583ee4cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib80f8f25389314c64f4ea45d3a2ef971f02c3025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:27 +00:00
Bill Yi 7bb1791b8e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dabcd0f326 -s ours am: 67c5f16300 -s ours am: 49efeac546 -s ours am: 5d74c13b89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaeee9fe7504d6e617bccd74c4efcffc87458685e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:10:13 +00:00
Bill Yi 08364c58fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 186f8a6143 -s ours am: 526000e713 -s ours am: d8dc46a403 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a2a6f952481dd9a1d1b54a6a06f5888638e424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 02:06:02 +00:00
Brandon Dayauon 8d04ff891f Merge "Remove unused onboardingPrefs" into udc-qpr-dev am: 7aaee510db am: afa6c0ff0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23681105

Change-Id: I3e13fc7cfea414e5ecd288fd20d36ec5fe7b723d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:59:52 +00:00