Commit graph

62181 commits

Author SHA1 Message Date
Jooyung Han
a232f9f196 Merge "Cleanup: use shared apex_key" into main 2023-10-24 03:46:05 +00:00
Shrikar Amirisetty
a1920a8189 Merge "Added access field to VehicleAreaConfig.aidl" into main 2023-10-24 03:10:19 +00:00
Yu Shan
723d476b5a Support property events batching.
Supports batching property change events based on configured time
window in DefaultVehicleHal. This will reduce binder callbacks but
will increase latency. This is configurable from IVehicleHardware
side, default is off.

Test: atest DefaultVehicleHalTest
Bug: 305111644
Change-Id: Id703e8486fdeb98a88cc27dbebe4d79f232f7e3d
2023-10-23 15:55:13 -07:00
Treehugger Robot
d35901540e Merge "Add NavIC L1 support in GnssNavigationMessage (hardware/interfaces)" into main 2023-10-23 17:20:23 +00:00
Aditya Wazir
7001c367ef Refactored keymaster4_utils_fuzzer
The following are the updates to the fuzzer:
1. Randomized order of apis.

Test: ./keymaster4_utils_fuzzer
exec/s: 4950
Bug: 302149569

Change-Id: Ie5d80a4e1d28ddd76a9c16609d20995d93710965
2023-10-23 07:04:48 +00:00
Jooyung Han
b1233e8928 Add rebootescrow HAL into APEX
Bug: 300011388
Test: VtsHalRebootEscrowTargetTest
Change-Id: I34c96187300057196c9bdc098daff2b59f056662
2023-10-23 14:52:43 +09:00
Jooyung Han
6e2b75d801 Add secure_element HAL APEX
This bundles the default implementation used by the cuttlefish.

Bug: 300011111
Test: VtsHalSecureElementTargetTest
Change-Id: Ib723fcbb6748675f6dae2449aad5a71a54cce594
2023-10-23 14:39:45 +09:00
Jooyung Han
07ac233182 Move input processor service into VAPEX
Bug: 300011114
Test: Cuttlefish runs InputProcessor service from VAPEX
Change-Id: I41e297650909f85b5ef45ae9beb2e7508213c96d
2023-10-23 14:06:24 +09:00
Hsiu-Chang Chen
802828f461 wifi: Enhance tombstone folder dumping behavior
In current implementation, files in the tombstone folder are only
archived when there is at least one active wifi interface. The
examination is unnecessary and it causes problems for us to get wifi
logs if reporter takes bugreport with STA/SAP off. In this change,
tombstone files will be archived regardless of the state of the wifi
interfaces.

Bug: 303429585
Test: dumpsys android.hardware.wifi.IWifi/default
Change-Id: I8a8b09f6473b2a1f93478b0393963e87b1fb9ad7
2023-10-23 01:02:40 +00:00
shrikar
1e8a0ef73e Added access field to VehicleAreaConfig.aidl
Changed VHAL version from V2 to V3 for VehicleAreaConfig changes

Bug: 290801790
Test: manual build
Change-Id: I20c85f2144b088ef2e70def32602c0d41c602d29
2023-10-21 17:20:54 +00:00
Yu-Han Yang
e28dd7900d Fix a deadlock in emulator HAL implementation
Before this change, a start() call will wait for previous threads to
finish. However, in ListenerMultiplexer.java in the framework, start(),
stop(), and deliverListener() calls are contending for the same lock.
Therefore, if a waiting start() is holding the lock, while the
almost-finishing thread is also going to hold that lock for calling
deliverListener(), a deadlock will happen.

This CL moves the waiting logic into the new thread of the start() call,
so that start() will return immediately. The new thread will wait for
the old thread to finish, and then start the actual work.

Bug: 299563185
Test: atest CtsLocationGnssTestCases
Change-Id: Ic2993a6d82c24688fa98d26d336c85518c683cf6
2023-10-20 21:53:38 +00:00
Treehugger Robot
cfc6b2260a Merge "Add comment to indicate the usage of the Service specific info in SDEA" into main 2023-10-20 21:18:56 +00:00
Nate Jiang
33864539f4 Add comment to indicate the usage of the Service specific info in SDEA
Bug: 301045790
Test: N/A

Change-Id: I5c844915d26dd6b47a7577f80faa408046058427
2023-10-20 17:38:34 +00:00
Jack Yu
7400ce9a6a Merge "Added Satellite messaging data support" into main 2023-10-20 15:58:42 +00:00
Andrew Walbran
8a3b8b8767 Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c am: 169722f132 am: db65f12707
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: Iceb20c400a582ab5e782c62f315d888589bf17f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:57:33 +00:00
Andrew Walbran
fa483fbf7c Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c am: 1433c78a7d am: a93658b9aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: Ic58e7198ed48f2faabf1f3c1b40c75be8620c184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:47:33 +00:00
Treehugger Robot
e913ab4ed1 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: e72b2f485f am: 77908fca71 am: ce72227b8d am: 4b54a01903 am: 9f331f19d1 am: 7e67506031
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: I5e98bf4b0e6e96306dea67602e02e4f71cdc746a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:47:24 +00:00
Treehugger Robot
a62d950981 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: e72b2f485f am: 5b3da2481d am: 965152b7a5 am: fce2010562 am: 327f51f2be
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: I9554255d9bdc4e4a575ce2bda1b11c96c38c0e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:47:14 +00:00
Treehugger Robot
ca0a376b4b Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: 3199222a90 am: ebbb85d3ba am: 343f1544fb am: 9476a1c459
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: Iad19fa6e22dedab1e1eea13478f6219c74ab105b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:47:04 +00:00
Changyeon Jo
b76bbb8d72 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 4e717156ce -s ours am: cfdde09b34 -s ours am: fddc9bbe78 -s ours am: 7e07c0dde1 -s ours am: 65f50a0cfa -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794433

Change-Id: Ie843bf611f591abe187f59439a4b4a164c9df24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:54 +00:00
Treehugger Robot
baac84ee38 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: 0591fbbcb4 am: c9c0815d4a am: 6e9ec671b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: If88a98cc16f87963c9ca6498a9eaa88d3195097d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:43 +00:00
Changyeon Jo
2bc2077509 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: d69178ad34 -s ours am: 410a598a1a -s ours am: 0f94b0a867 -s ours am: 8f2ba28089 -s ours am: 8e5e8a6d18 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794433

Change-Id: I43f786e92959f0cccd516f6f6f86cddd8c70f3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:33 +00:00
Changyeon Jo
62eef91772 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 2405c6f40e -s ours am: 3c67792054 -s ours am: 7508fad55f -s ours am: f31f93fedc -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794433

Change-Id: I0018613fdfa671c3a01e68da63872f73cba2eb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:23 +00:00
Jooyung Han
96420d0f47 Merge "Cleanup: use a shared apex_key" into main am: b0675a2ecb am: 5c90b3b7f1 am: 5df65b5638
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780307

Change-Id: Ic01f7e230bc520e76d270ec713e04056d68c078f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:13 +00:00
Jooyung Han
fa1bb85fca Merge "Cleanup: use shared apex_key (fingerprint APEX)" into main am: 52dec402f0 am: 5e4770c7f0 am: 7e3a2446b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780313

Change-Id: I7e30be88708f6fe3df21f82843f462a6f2253a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:46:02 +00:00
Jooyung Han
c0592192b5 Merge "Cleanup: move VINTF fragment into VAPEX" into main am: e8d679e223 am: 65a3102d41 am: 73850fb99f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780410

Change-Id: I6be15609a22f97e6507e237e0d2398dd4e695963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:52 +00:00
Changyeon Jo
3e5b2390e8 [automerger skipped] Update VtsHalEvsV1_*TargetTest am: ab78601274 -s ours am: ddb56ed736 -s ours am: 64d009118f -s ours am: e4dc17e4cc -s ours am: 35f99051e3 -s ours
am skip reason: Merged-In Id41bde10964b650f78e76d4f97a4588367f7c7fc with SHA-1 13fb8a7a82 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794433

Change-Id: I4bd024f0e1b026c789ce90eea2742f34390a8087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:41 +00:00
Shunkai Yao
873ad88b82 Merge "Fix cts Pre/post Processing failures on Cuttlefish aidl" into main am: 48415986d9 am: 108782bcfd am: 035ab7b720
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794102

Change-Id: Ib8b26e19289753eac1ad3b8cf87e4a51f6c75109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:45:27 +00:00
Changyeon Jo
bf66fd8937 Merge "Update CameraStreamBuffering test and correct instance name" into main am: 945c9aa1de am: a7e5836f4e am: ad8f18eb18
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2796792

Change-Id: I8e2483e68f5b0752d85d948de56baf1e8185915c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:24:13 +00:00
Mikhail Naganov
4a8490f91d audio: Use hardcoded r_submix configuration with XML am: fc35ca3d32 am: 1e67ba3e09 am: 6915cc4812
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794109

Change-Id: I770911caacfb740d19caa719498c12138da38634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:34 +00:00
Lorena Torres-Huerta
02b419d8b0 audio: Set connectedProfiles for non-attached device ports. am: f7492518c7 am: 72a4dbc9a5 am: 3108b3aac6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794108

Change-Id: If77993d47b9a0aa3df1db58b9b88db73487cc75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:31 +00:00
Lorena Torres-Huerta
8753e9af8c audio: Populate MicrophoneInfo with vendor data am: 533cc78aab am: 505834f376 am: 3d3aad42f9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794107

Change-Id: I74034420b0e022c8c798a5ae9d45eed5bd6a42a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:27 +00:00
Mikhail Naganov
ec53542fe7 audio: Implement proper parsing of masks in XsdcConversion am: cc21b6f2e6 am: 9f2c28f89d am: b6e9758ead
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794106

Change-Id: I2a74913525ece4b5efd612f922e8f532514fdcfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:20 +00:00
Lorena Torres-Huerta
7b4fb1aee7 audio: Parse module configurations from the APM XML files am: 394e2527b5 am: 53e0782ad4 am: e6715cec34
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794105

Change-Id: Ibeb7cdf2aa0152555dc307168e81ee2dadb8dae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:07:16 +00:00
Jooyung Han
baaa27b411 Merge "Use explicit requirements from APEX" into main am: 5de1785959 am: ea79c3a3b4 am: bed6c5bb00
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2785639

Change-Id: Id93d843b36956a13c86510a51817dffe168035b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:59 +00:00
Yu Shan
9a840a12ab [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 38bda7a86f -s ours am: 4eac643b64 -s ours am: 85b6e55b26 -s ours am: ece151d91a -s ours am: 5042161c75 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2779278

Change-Id: Ie33b1d0e95dffe7c997c21f58d99e5b55f9d102e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:47 +00:00
Yu Shan
bab4cffdb6 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 1983edaebc -s ours am: 1b4a1145b4 -s ours am: 0227be3bfb -s ours am: 6cd08f0e2b -s ours am: 1a772a389d -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2779278

Change-Id: I6c5573a09d63e7b517b2767bf7206ea7226fb3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:35 +00:00
Yu Shan
12de5f41d3 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: 76623de19a -s ours am: acb6dddec5 -s ours am: 0c2e442597 -s ours am: 43852bcc91 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2779278

Change-Id: Ifb3c7a058e67150708991327418ee86fd85c1996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:06:23 +00:00
Yu Shan
9352746375 [automerger skipped] Allow CDD required properties to be absent in VTS. am: 775b6eca77 -s ours am: 9e9ee99ccd -s ours am: abb7c878b0 -s ours am: 6eed0ed069 -s ours am: 36fbae6109 -s ours
am skip reason: Merged-In I93020e7e024760601bc5a8edf9997cc356a568c6 with SHA-1 da7a4ddabd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2779278

Change-Id: I873ccb4d5132d7affb21e0e9b55f10a65e4b984d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:46:05 +00:00
Jooyung Han
5d1e45521e Merge "Cleanup: use shared apex_key (wifi HAL APEX)" into main am: de82b61de8 am: 5a92d4a379 am: 7af34a3117
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780370

Change-Id: Ieda357045a2424ec659c6b0faa663ea3763a25ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:21:32 +00:00
Treehugger Robot
0f98a4e6d2 Merge "Cleanup: use shared apex_key" into main am: 254c650c58 am: d109330b0e am: abc37c40b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780409

Change-Id: I5becdf080f5bf7ca7307e92c6152ff1fcb749a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 01:21:21 +00:00
Jack Yu
7e31be1c00 Added Satellite messaging data support
1. Added RCS APN type which maps to RCS network capability. Note
   This APN type is not specific for satellite uses only. This
   can be used for regular single registration RCS.
2. Added a new tri-state field "infrastructure" in APN entry. The
   infrastructure type can be terrestrial only, non-terrestrial only, or
   both. This is for some APNs can be used when the device is attached
   to satellite.

Fix: 294065845
Test: atest ApnSettingTest DataNetworkControllerTest DataProfileManagerTest
      DataProfileTest TelephonyNetworkRequestTest
Test: Basic phone functionality tests
Change-Id: I15741cbefdb459155e278ef3d197d50c747405f0
2023-10-19 17:19:51 -07:00
Xin Li
12d4ca1e29 [automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 3d862c9608 -s ours am: 4fe31ce727 -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25089573

Change-Id: I025ae3b062bae97d50e892e5def29acc566bff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:58:58 +00:00
Xin Li
805f18e3d8 [automerger skipped] Merge 10952656 am: 84fe582d6e -s ours am: 2d03aee5eb -s ours
am skip reason: Merged-In I27fe6f65f491db9d88710cf163eba12079499a09 with SHA-1 f7e0442a7b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25089573

Change-Id: Ic29664f3166db1808c655ade1a77026b370cd47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:55:08 +00:00
Andrew Walbran
db65f12707 Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c am: 169722f132
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: I7dfa70da3dc0d8989cb546cc49f4c9ef078270e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:21:00 +00:00
Shunkai Yao
fb263ea992 Merge "Add defaults for audio AIDL interfaces" into main 2023-10-19 23:14:22 +00:00
Andrew Walbran
a93658b9aa Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c am: 1433c78a7d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: Ib056e62c02c4227878e7086054fda6723268b54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:04:13 +00:00
Andrew Walbran
1433c78a7d Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: Ifd701cf30c09a1b0e659e478b8d5f0f5fba9bf37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:45:21 +00:00
Andrew Walbran
169722f132 Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: I45aec943b31ce04e986e6f44f1f9553888a588c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:43:30 +00:00
Treehugger Robot
7e67506031 Merge "Add a config with test skipping for SDK < 33" into android13-tests-dev am: 632438dc9e am: e72b2f485f am: 77908fca71 am: ce72227b8d am: 4b54a01903 am: 9f331f19d1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787019

Change-Id: I41c1a4ae2297dfba1e8d0a6d5fb467f69c18d1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 22:29:41 +00:00