aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I471f36124dd23658ead8c54920e2eb9049103d73 Change-Id: I0c0c7274f61b9cf41d01a7a3891d73a68d3199e5
2023-05-25nugget: Add a app specific error code to reflect different state am: 769eb9719bTommy Chiu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/23379250 Change-Id: I471f36124dd23658ead8c54920e2eb9049103d73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24nugget: Add a app specific error code to reflect different stateandroid14-devTommy Chiu
When flashing new firmware there was always one kind of error which is "LOCKED". Add a new NUGGET_ERROR_VERIFY to reflect the readback check failure. Bug: 261483407 Test: init_citadel Change-Id: I1a0b60a0324e4944c3956868747f2ae80102d701
2023-04-11Change the GSA NOS_CALL detctionJoseph Jang
This is a short term solution to allow Citadeld to correctly detect GSA new IOCTL interface and route Android data to GSA NOS_CALL handler. Bug: 255688398 Change-Id: I5a2db9ca8405fcbb1c46bba0f56f1bebe39da7f0
2023-04-06KM: Add SetSystemVersionInfoRequest.vendor_api_level definitionTommy Chiu
We'll need to pass the vendor_api_level to TA for some attestation data encoding. Bug: 275394135 Test: VtsAidlKeyMintTargetTest Change-Id: I3276d064e83422952f7ac31554932cc12be6e1a8
2023-03-29Move libnos_datagram lib back to external/nosJoseph Jang
Since Android git_udc-dev-plus-aosp-without-vendor has no vendor image, so if we move libnos_datagram lib to vendor/google_nos, it will cause build break in git_udc-dev-plus-aosp-without-vendor. So move libnos_datagram lib back to external/nos as a short term solution. Bug: 275652569 Change-Id: I70b1560ac7a0d6edc2202b03cde7951bc51a28eb
2023-03-28Merge "Move Android libnos_datagram library to /host/android" into udc-devJoseph Jang
2023-03-27Merge "Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-004" ↵TreeHugger Robot
into udc-dev
2023-03-24Move Android libnos_datagram library to /host/androidJoseph Jang
In order to customize libnos_datagram library for Android, move libnos_datagram to /host/android folder and have corresponding binary to link to /host/android/ libnos_datagram library. Bug: 255688398 Change-Id: Ic8b2db8e5c2ee8460952a1f48fa7782048c5f1b3
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s ours am: ↵Xin Li
e70fd865fe -s ours am: c3e1bcc586 -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: I10d0e3bf7724220056242e42477b1285d4e69662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s ours am: ↵Xin Li
e70fd865fe -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: Idd8058baeee414b72eafe45bf382aaf84bf9cb4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 74cd49e233 -s oursXin Li
am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2486972 Change-Id: I1f48541d5edf87503a3992cb552ea540f72d4f55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: Iab6f115a57b94a85e3c371bc8d7ebebbf552884c Change-Id: I0147f918353ac5952c2a02c5921199583d9206a9
2023-03-10Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-004Kevin Zhang
* goog/upstream-master: KM: Add ATTESTATION_ID_SECOND_IMEI definition Add Avb.GetCarrierLockName to expose carrier lock version. Bug: 269809537 Bug: 254287511 Bug: 262255219 Test: manual, QMC Change-Id: I698c697b8b6fb7be6f053a270f951a71cc51b4cc
2023-03-07KM: Add ATTESTATION_ID_SECOND_IMEI definitionTommy Chiu
Bug: 262255219 Test: VtsAidlKeyMintTargetTest, Change-Id: Idc07e44accffdcdaff83e4958d322b6f186d8658 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56826 Presubmit-Verified: Android Build Prod User <treehugger-gerrit@google.com> Reviewed-by: Lingyun Zhao <lingyunzhao@google.com> Tested-by: Tommy Chiu <tommychiu@google.com>
2023-03-02Add Avb.GetCarrierLockName to expose carrier lock version.Lingyun Zhao
go/pixel-gsc-avb-key-migration-dd Test: atest VtsHalOemLockTargetTest Bug: 254287511 Change-Id: Ie05b0b231bf55f829d6f9b46eef5060c7194eb3d Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/57265 Reviewed-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <treehugger-gerrit@google.com>
2023-02-17Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-003Lingyun Zhao
* goog/upstream-master: Change APP_ID_TEST to 0x7f secure_transport: Add secure link test command KM: Add second IMEI provisioning definition KM: Add multi-IMEI feature definition secure-transport: Add GSA-GSC secure channel usecase handshake command KM: Add GenerateRkpCsrV2 definition MockNuggetClient: Fix build break by adding new CallApp mock method Bug: 268566694 Bug: 268150153 Bug: 265199825 Bug: 262255219 Bug: 261705851 Bug: 201592534 Bug: 243454124 Bug: 263756493 Test: release tests, QMC Change-Id: I93ffd7b3a79c2060e1cdb03572f8ab95e791e8b9 Merged-In: I93ffd7b3a79c2060e1cdb03572f8ab95e791e8b9
2023-02-09Change APP_ID_TEST to 0x7fBill Richardson
The 0xff value conflicts with the APP_ID_NO_PROTO_FLAG, although I'm not certain anything uses it from this file. None of these APP_ID_*TEST definitions should be in here, really. Bug: None Test: None Change-Id: Id05d003fa9ad280bc44dc7908cc4639365ef6119 Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56945 Reviewed-by: Kevin Zhang <zhakevin@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2023-02-09secure_transport: Add secure link test commandJoseph Jang
Add secure link test command for CM factory team testing. Bug: 268150153 Change-Id: I0f6455c736043046c6c394d4433a17ba47517789 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56825 Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2023-02-07KM: Add second IMEI provisioning definitionTommy Chiu
Bug: 265199825 Change-Id: Id1630be7bdea668b73ceec0a1ffcbd5cec61ac65 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56524 Tested-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Autosubmit: Tommy Chiu <tommychiu@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Kevin Zhang <zhakevin@google.com>
2023-01-18KM: Add multi-IMEI feature definitionTommy Chiu
Keymint v3 requires to support multiple IMEI attestation. That'll involve changes including - ID provision in phone CM - ID attestation in TA Besides that, the duo-sku GSC on P23 makes things more complex. Add this feature map for a batter maintance. Bug: 262255219 Bug: 261705851 Test: build pass Change-Id: I234bf37777ec80c9ff3ecfca9cda8b42fa096d78 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56625 Autosubmit: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Lingyun Zhao <lingyunzhao@google.com> Tested-by: Tommy Chiu <tommychiu@google.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
ac57efd0dd -s ours am: 5783f1eaa8 -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20948077 Change-Id: Iae26d29205025e8092226a28a7160c2539567a9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
ac57efd0dd -s ours am skip reason: Merged-In Iab6f115a57b94a85e3c371bc8d7ebebbf552884c with SHA-1 30ce5bfe58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20948077 Change-Id: Iffa326cc4f279986c4f8893cd85ea766c346e231 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: Iab6f115a57b94a85e3c371bc8d7ebebbf552884c Change-Id: Ic112f122f943b44165a4eb811ca2329566f1d483
2023-01-11secure-transport: Add GSA-GSC secure channel usecase handshake commandJoseph Jang
Bug: 201592534 Change-Id: Ifabe99105c4a063edfccc5cd510ad4277b90d3ac Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/51807 Presubmit-Verified-Together: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Brian Murray <brianjmurray@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2023-01-10KM: Add GenerateRkpCsrV2 definitionTommy Chiu
Bug: 243454124 Test: VtsHalRemotelyProvisionedComponentTargetTest Change-Id: Iedf7a27f166b83c1eb51e379ec7b9800c5fb4fbb Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56186 Tested-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified-Together: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Kevin Zhang <zhakevin@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2022-12-28MockNuggetClient: Fix build break by adding new CallApp mock methodJoseph Jang
Bug: 263756493 Change-Id: I8316e3860ccdf2d5ceaa9ab01d312e6e40ab11d7 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56324 Tested-by: Joseph Jang <josephjang@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2022-12-27MockNuggetClient: Fix build break by adding new CallApp mock methodJoseph Jang
Bug: 263756493 Change-Id: I8316e3860ccdf2d5ceaa9ab01d312e6e40ab11d7
2022-12-27Merge remote-tracking branch 'goog/upstream-master' into D3-UDC-002Joseph Jang
* goog/upstream-master: identity: Add new APIs for Android 14 weaver: update C-HAL to match AIDL Remove use of deprecated ByteSize Proto: add KM::ExportDeviceIds definitions secure_transport: Add one byte to indicate if need to report suez data Add weaver headers for non-protobuf API Add nos::has_feature() to query Nugget OS features Add new CallApp() signature Add missing string for APP_ERR_NOT_READY Remove acropora internals from feature_map.h Print App number as hex, not decimal feature-map: Publish the feature list definition Nugget: Add NUGGET_PARAM_GET_FEATURE_SUPPORT support Bug: 201592534 Bug: 243819056 Bug: 255259684 Bug: 257118594 Bug: 257119908 Bug: 259501951 Bug: 259556049 Bug: 260245541 Bug: 261551456 Bug: 263756493 Test: release tests, QMC Signed-off-by: Joseph Jang <josephjang@google.com> Change-Id: Id99cbad17155ac8a1882940fa576216e29c442f1
2022-12-21identity: Add new APIs for Android 14Joseph Jang
Bug: 255259684 Test: atest VtsHalIdentityTargetTest atest android.security.identity.cts Change-Id: Ib6b32ed31049fe14b1c5a000bb98d2b5b3c91e1c Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/54944 Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Tommy Chiu <tommychiu@google.com> Tested-by: Joseph Jang <josephjang@google.com>
2022-12-17[automerger skipped] [DO NOT MERGE] Titan-M firmware: D3-UDC-001a am: ↵Bill Richardson
30ce5bfe58 am: 330059f04c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20677747 Change-Id: I626f9e132ab7b290e04bd0caa0286bc87557aa37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17[DO NOT MERGE] Titan-M firmware: D3-UDC-001a am: 30ce5bfe58Bill Richardson
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20677747 Change-Id: I3a2acb1625a9d71ef8669e144b9f9744b4b33da9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16weaver: update C-HAL to match AIDLBill Richardson
Bug: 259556049 Test: manual: nugget_aidl_test_weaver Change-Id: Id3f77966b6899682d65ef9780c3d2a961e684418 Signed-off-by: Bill Richardson <wfrichar@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/56126 Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Brian Murray <brianjmurray@google.com>
2022-12-16[DO NOT MERGE] Titan-M firmware: D3-UDC-001aandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseBill Richardson
* goog/upstream-nugget-os-tm-qpr-dev: Remove use of deprecated ByteSize Proto: add KM::ExportDeviceIds definitions Change STATUS_MAX_LENGTH to minimum needed secure-transport: Report 1 byte final state back to GSA identity: Add new item for ICstartRetrieveEntryValueResponse and fix naming Bug: 261797343 Test: release tests, QMC Change-Id: Iab6f115a57b94a85e3c371bc8d7ebebbf552884c
2022-12-12Merge "Merge Android 13 QPR1 am: 17d98471e3" into stage-aosp-master am: ↵Automerger Merge Worker
6c18b3980e am: d7694d4964 Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: Ia6514f9a8cf101a28783af8c0762309ba5f99eab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12Merge Android 13 QPR1 am: 17d98471e3 am: b314d986e7 am: db0c1e8369Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: Idb366cc4f74203727ffc46506f6cc9a129b6e027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge "Merge Android 13 QPR1 am: 17d98471e3" into stage-aosp-master am: ↵Automerger Merge Worker
6c18b3980e Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: If99f4301621b6ea3d0dcc274eaa34f436ae72076 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge Android 13 QPR1 am: 17d98471e3 am: b314d986e7Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: I2aaa96dd4f2bbffb8146cd784023fc9a6befc8cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "Merge Android 13 QPR1 am: 17d98471e3" into stage-aosp-masterAutomerger Merge Worker
2022-12-09Merge Android 13 QPR1 am: 17d98471e3Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: I8fee994c0b422f56d9a61d59021eaef09a2a8b82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1 am: 17d98471e3Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2336947 Change-Id: Ibe4eb7d438b159577b13f5932a032470ac2358a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: I437deac4cb298b47966f6e44adccc0a388d6c1de Change-Id: Id4ce04349c91c624085dfb9f27aa3ad5d2d5058a
2022-12-09Remove use of deprecated ByteSizeDonnie Pollitz
* Generated code was using deprecated ByteSize, use ByeSizeLong instead. Bug: 261551456 Bug: 260245541 Test: Client side builds Change-Id: Ib2d2d68347ddcc40a6a5de817321e84a95d4ba25 Signed-off-by: Donnie Pollitz <donpollitz@google.com> Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/55844 Reviewed-by: Kevin Zhang <zhakevin@google.com> Autosubmit: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Tested-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Tommy Chiu <tommychiu@google.com>
2022-12-08Proto: add KM::ExportDeviceIds definitionsTommy Chiu
Bug: 259501951 Change-Id: Ifa850ecac30b4b7b283c871bcbbcfb89da2b142d Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/55705 Reviewed-by: Tommy Chiu <tommychiu@google.com> Reviewed-by: Kevin Zhang <zhakevin@google.com> Tested-by: Tommy Chiu <tommychiu@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2022-12-01secure_transport: Add one byte to indicate if need to report suez dataJoseph Jang
Bug: 201592534 Change-Id: Icc9876477389e395074fa569f2f03de31b870f98 Reviewed-on: https://nugget-os-review.googlesource.com/c/host/generic/+/55725 Presubmit-Verified-Together: Android Build Prod User <android-build-prod@system.gserviceaccount.com> Reviewed-by: Bill Richardson <wfrichar@google.com> Presubmit-Verified: Android Build Prod User <android-build-prod@system.gserviceaccount.com>
2022-11-23[automerger skipped] Rename record structs to report for clarity am: ↵Kevin Zhang
52cf7f81cb am: 1aa877d335 -s ours am skip reason: Merged-In Ic2a09de65b0f0b44dcc2ac5fd5e5a0f06f4e4f2e with SHA-1 52f1fc8795 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20531642 Change-Id: Ie497e421c991d79410a7644ebf5ea0f1f4304b1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23[automerger skipped] Added command support for fetching big events am: ↵Kevin Zhang
ef60e048d2 am: dcfaef9580 -s ours am skip reason: Merged-In Ic2a09de65b0f0b44dcc2ac5fd5e5a0f06f4e4f2e with SHA-1 52f1fc8795 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20531641 Change-Id: If8e20967ad032b20cd8bff12a3865204b03aa3f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23[automerger skipped] Add big event struct am: 4ee9f0844f am: 880f3e5b57 -s oursKevin Zhang
am skip reason: Merged-In Ic2a09de65b0f0b44dcc2ac5fd5e5a0f06f4e4f2e with SHA-1 52f1fc8795 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20531640 Change-Id: I4099a4baf5a6cc717c5f307690c531074b418f09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22Rename record structs to report for clarity am: 52cf7f81cbKevin Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20531642 Change-Id: I5800dbda8b7e925c4f06dfb8b922854baa48f379 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22Added command support for fetching big events am: ef60e048d2Kevin Zhang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/20531641 Change-Id: Ifa642431f843bb4867500ce67c0a49e3fa91088b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 06:08:01 +0000