Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 02:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,252 Commits 4 Branches 0 Tags
430b96574424dd08055bc9cecdcd035b09b75183
Commit Graph

66252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
430b965744 [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 am: aeb7d0f4ee am: 5970512ccb -s ours 
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

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

Change-Id: Ic2666a9d44ae5dc8c01a8a4466c16dc5cb1a00df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:37:37 +00:00
Devin Moore
b0922de1e9 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 am: 82d085a8e2 am: 04a7668333 -s ours 
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

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

Change-Id: Iaa6382e195d5cefb52ea6270396edf166ea3e886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:37:18 +00:00
Treehugger Robot
3a3119638a [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 am: 823a222711 -s ours am: d0d3b6cae0 -s ours am: 4f5033684e -s ours 
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

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

Change-Id: I533e1c351653a93c1683b29cd9e914534a490250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:12:01 +00:00
Devin Moore
c882ecfc05 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 am: f1780bc844 -s ours am: 103bb4b8b4 -s ours am: 18524d6645 -s ours 
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

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

Change-Id: If234966be87b1dd6cb68800312eb8d73916e87fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:11:46 +00:00
Treehugger Robot
c2ed3a674f [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 am: f63a75db77 -s ours 
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 def7a3cf59 is already in history

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

Change-Id: I743020c33f56ef7a5f8280af7e2e43434d468b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:11:28 +00:00
Devin Moore
63263d45f6 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 am: 0ae92822f1 -s ours 
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 92f705cee5 is already in history

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

Change-Id: I37ac9047dc03fdb79975cadb92c82cc6b78dbe1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:11:06 +00:00
Treehugger Robot
5970512ccb Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 am: aeb7d0f4ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: Ie8f1f7539870073c5c0cfbf3eef1ed89afa4fc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:10:50 +00:00
Devin Moore
04a7668333 Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 am: 82d085a8e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: I61f45164dc3f40619bcd2ec1c7631a009995ed98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 18:10:31 +00:00
Treehugger Robot
4f5033684e [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 am: 823a222711 -s ours am: d0d3b6cae0 -s ours 
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

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

Change-Id: I0b15bcbbd618dfc3ce4bc4be27a072b837c4bf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:59 +00:00
Treehugger Robot
aeb7d0f4ee Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I264c240db15632b017866d49bba81ae620f81073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:52 +00:00
Devin Moore
18524d6645 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 am: f1780bc844 -s ours am: 103bb4b8b4 -s ours 
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

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

Change-Id: Iea88202e1d0000018f4c0da3f6d1a78ea98cf064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:46 +00:00
Devin Moore
82d085a8e2 Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: Ifd2299a25186a95a0a6738cbd4cff13fa8f73142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:36 +00:00
Treehugger Robot
f63a75db77 Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I4e82cc26f08604eca734eb673c3c508a1bf33d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:34 +00:00
Devin Moore
0ae92822f1 Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 am: 2d035d5408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: I1dfaad509fed054c2a5bf4edb1e2df309cd8571e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:17 +00:00
Treehugger Robot
d0d3b6cae0 [automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 am: 823a222711 -s ours 
am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b55 is already in history

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

Change-Id: Ibdb1d4b8a6ec820d1980b64141051c321e4f80e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:53:12 +00:00
Devin Moore
103bb4b8b4 [automerger skipped] Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 am: f1780bc844 -s ours 
am skip reason: Merged-In Iee4783217cc88134af6de0fe66128684ca984dba with SHA-1 1e1627a5da is already in history

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

Change-Id: Ieb7fb91a9979d9282c33a071df1a997805926715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:52:50 +00:00
Treehugger Robot
fe984ebf99 Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I81e95990fee34a786c79024154687dbf456d0cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:29:12 +00:00
Treehugger Robot
823a222711 Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 88ced41d81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: Iceca99fc043b1ff85773692bd3340afc14f86f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:28:56 +00:00
Devin Moore
2d035d5408 Use onUnlinked in health HAL am: 1e1627a5da am: b48ba49001 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: Icdbfa83cbf6338aada5d4b0d2f4348b2ed97387d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:28:55 +00:00
Devin Moore
f1780bc844 Use onUnlinked in health HAL am: 1e1627a5da am: f4eac52813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: Ifcf22db739b5c16a3a4802b59f511e24500355c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:28:36 +00:00
Treehugger Robot
88ced41d81 Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I4715cb58112e9330f2f4adc7eee4a35fd97ce04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:19:10 +00:00
Treehugger Robot
3ebbbd99a3 Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476

Change-Id: I4d91da390c982d17875a6218a296f838915ab907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:19:08 +00:00
Treehugger Robot
74770054e9 Merge "Keep track of DeathMonitor cookies" into tm-dev 2024-06-03 17:11:15 +00:00
Devin Moore
f4eac52813 Use onUnlinked in health HAL am: 1e1627a5da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: I63df333995f92d5ae313c1429c00178a88695578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 16:56:30 +00:00
Devin Moore
b48ba49001 Use onUnlinked in health HAL am: 1e1627a5da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27145126

Change-Id: If1620271aff8805d05d14b08efb5a66279269e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 16:56:26 +00:00
Treehugger Robot
db2431f976 Merge "Fix build on clang-r522817" into main am: c63722a30c am: b6cb602d2a 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3110841

Change-Id: Iae86025807a5cfad3aa4d5f68a05dbadb3eb6cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-01 20:53:38 +00:00
Treehugger Robot
b6cb602d2a Merge "Fix build on clang-r522817" into main am: c63722a30c 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3110841

Change-Id: Ifccb6c0ba78e3578127a3d67c2bb18b2902de2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-01 20:47:38 +00:00
Treehugger Robot
c63722a30c Merge "Fix build on clang-r522817" into main 2024-06-01 20:37:37 +00:00
Yi Kong
9053d1a6fc Fix build on clang-r522817 
hardware/interfaces/automotive/can/1.0/tools/libprotocan/MessageInjector.cpp:44:8: error: no member named 'lock_guard' in namespace 'std'
   44 |   std::lock_guard<std::mutex> lock(mMessagesGuard);
      |   ~~~~~^

Bug: 322868540
Test: presubmit
Change-Id: I45cd6a8420e508a37e2b6da456933c036493e15e
 2024-06-02 04:29:38 +09:00
Treehugger Robot
829013951d Merge "VTSHalPowerTarget: Add condition check for FMQAidl teardown" into aosp-main-future am: c9f801bbd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27630526

Change-Id: If59cea4e2a3add6c93c1e486c960c8371eb49323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-01 00:18:08 +00:00
Treehugger Robot
c9f801bbd4 Merge "VTSHalPowerTarget: Add condition check for FMQAidl teardown" into aosp-main-future 2024-06-01 00:14:32 +00:00
Treehugger Robot
0efbdb6688 Merge "[uwb-hal] add antenna mode app config param" into main am: c99ca5a384 am: 3ddd4246d9 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3101668

Change-Id: If875ee4337d12530a7c4514867246b1755729bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-31 18:43:09 +00:00
Treehugger Robot
3ddd4246d9 Merge "[uwb-hal] add antenna mode app config param" into main am: c99ca5a384 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3101668

Change-Id: I41ddd35254e3d541f25381ab1546191938b7382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-31 18:35:34 +00:00
Treehugger Robot
c99ca5a384 Merge "[uwb-hal] add antenna mode app config param" into main 2024-05-31 18:30:53 +00:00
jimmyshiu
2c3b63f04f VTSHalPowerTarget: Add condition check for FMQAidl teardown 
While FMQAidl Setup() was skipped, some uninitialized objects would be
used in FMQAidl Teardown() which caused the test failed.
Add some condition check to prevent from using uninitialized objects.

Test: atest VTSHalPowerTarget
Bug: 328330332
Change-Id: I83081cbef66da1d74d87e191f266cb16fb559b85
(cherry picked from commit d3753ec91d)
 2024-05-31 18:04:21 +00:00
David Drysdale
82af9b5a1d KeyMint: add VTS test with all IDs am: ef1123b24e am: acb80cfdf2 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3106417

Change-Id: I11cd9fca35022b28c244f2ee3e88dd7d06cb8d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-31 12:27:37 +00:00
David Drysdale
acb80cfdf2 KeyMint: add VTS test with all IDs am: ef1123b24e 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3106417

Change-Id: Icfc31847731c3ca48492234751033d4be8ada033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-31 12:19:59 +00:00
David Drysdale
ef1123b24e KeyMint: add VTS test with all IDs 
Add a test that includes all of the device IDs for attestation, which
helps to check whether the emitted extension is including everything in
the correct order.

(This is already tested in CTS since aosp/2650044)

Also fix test of first API level to use `get_vsr_api_level` helper.

Test: VtsAidlKeyMintTargetTest
Test: with/without KeyMint hacked to emit tags in wrong order
Change-Id: Ic6e489aa99c773d794ad8cbddbe5153b1a145ea5
 2024-05-31 12:05:04 +01:00
Kiyoung Kim
416e8efe24 Remove Vndk_use_version property from AIDL am: 7c0d9eb259 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27589611

Change-Id: I439948e0bcd97d2122b470ed92c01d9019af7c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-31 00:35:13 +00:00
Treehugger Robot
8fe4b5974e Merge "Revert^2 "Change ifname to interface handle in set_scan_mode api"" into main 2024-05-30 17:19:45 +00:00
Sunil Ravi
6806a9dd81 Revert^2 "Change ifname to interface handle in set_scan_mode api" 
This reverts commit 3a4e5591c0.

Reason for revert: Fix for build failure identified

Change-Id: I1f7784f67b575103bb5a6f3ce77fb9551f1f1471
 2024-05-30 03:46:24 +00:00
Kiyoung Kim
7c0d9eb259 Remove Vndk_use_version property from AIDL 
Vndk_use_version property is no longer in use with deprecation of VNDK.
Remove Vndk_use_version property and its usage.

Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: I681cc850341a7dc47416dc81c1da21b687f87b1b
 2024-05-30 03:29:10 +00:00
Treehugger Robot
d642d33087 Merge "EnvironmentalReverbTest: Add Tests to Validate Environmental Reverb Effect" into main am: 56e050362d am: 53e8ea6f82 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3088945

Change-Id: I38c94263e59a17065bb7e793a67f276bd507f691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:39:23 +00:00
Treehugger Robot
1fef7efdd2 Merge "Replacing manual CBOR description with CDDL." into main am: 4e4299e2e6 am: 082c112081 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3095936

Change-Id: I59e5e65d3ac68913cbbab9554634ee774a4ea53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:29:54 +00:00
Treehugger Robot
744e585deb Merge "Added keymint_authSet_fuzzer" into main am: 7884619140 am: 14ae5a614b 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3066744

Change-Id: Iedac2a42bb498d0a74ed6d372a2063df3a1b8d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:11:56 +00:00
Treehugger Robot
fe4d6d05a0 Merge "Added keymint_attestation_fuzzer" into main am: 02a086bdaa am: 6707c6716b 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3066743

Change-Id: I8d70d7e71ce5843b669e1b106150801849afbde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:10:43 +00:00
Yu Shan
211b36c551 [automerger skipped] Merge changes I35f4860e,I4f02885b into main am: e2e4e54a0a am: 7502bc52b8 -s ours 
am skip reason: Merged-In I35f4860eead0c8ec9b192657fe51cc0ff4319383 with SHA-1 cb00b1f816 is already in history

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

Change-Id: Id7e5691ed32d9452afdba276ff34fb44845dd85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:01:42 +00:00
Yu Shan
2f115618ce [automerger skipped] Add subscribe to VHAL proto. am: 5c846f7cc9 am: 89ab8c7623 -s ours 
am skip reason: Merged-In I4f02885b77f21a215a8b282be583f76118e400ba with SHA-1 f1a869055f is already in history

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

Change-Id: I24135f4ea127c6d3741ecaf22f40257023c1402c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 22:01:38 +00:00
Xin Li
0578865bf3 Merge "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 64e598ce2b -s ours" into main 2024-05-29 21:59:30 +00:00
Xin Li
efc915a7b6 [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 64e598ce2b -s ours 
am skip reason: Merged-In I53a278f1317f5307441103dc42dc5be6f20d7075 with SHA-1 0a36f19c73 is already in history

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

Change-Id: I3eb53eab33e0e5a99d1279ac10451ee277832677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 20:49:48 +00:00