LaMont Jones
ae970ba410
Merge changes from topic "mod-info-foreach" into main am: e75c063d1f
am: 4bbf7a86af
am: 53ddfdb0f2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522
Change-Id: Ia59d0b303573670c0b89d33d347a8b38d1a5ad3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 01:45:43 +00:00
Treehugger Robot
8e2e4ffb61
[automerger skipped] [conflict] Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114
am: fbd3468d1e
am: 89537698fc
-s ours
...
am skip reason: Merged-In I740ef3225c4c291ef7313d3ff1fe5d78389497f5 with SHA-1 aa6c2f4677
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24059852
Change-Id: Id7cd7faa44c21ae05f0bda9121fd292faa76cbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 01:43:29 +00:00
LaMont Jones
53ddfdb0f2
Merge changes from topic "mod-info-foreach" into main am: e75c063d1f
am: 4bbf7a86af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522
Change-Id: If6d6a995bcb3496f65b0378e98afe2ecaed34758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 01:22:53 +00:00
Amith Dsouza
aa6c2f4677
Update BUILD_ID
...
Master branch has been renamed to main, the build id needs to reflect
this change.
Ignore-AOSP-First: Merge conflict resolutions
Bug: 290400015
Change-Id: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
(cherry picked from commit f0898eae07
)
2023-07-13 23:45:12 +00:00
Treehugger Robot
89537698fc
[conflict] Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114
am: fbd3468d1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24045736
Change-Id: I07e0288cd11ad3500746f0ffdf620a5e4b93c0b4
Merged-In: I740ef3225c4c291ef7313d3ff1fe5d78389497f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 23:14:58 +00:00
Treehugger Robot
33be06ee93
[automerger skipped] Merge "Update BUILD_ID" into main am: 442e8719b9
-s ours am: a562d4abb7
-s ours am: b20f0458cb
-s ours am: 8fd129d361
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: I04c84001756ce0dc23a4ba1f00bd05bc436b076e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 20:53:43 +00:00
Amith Dsouza
c51a099e01
[automerger skipped] Update BUILD_ID am: cab8fc9658
-s ours am: 9901306f4a
-s ours am: 0c3978717e
-s ours am: db65ce5ce1
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: I2a627876a2495717129d6be1676081785bd25e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 20:53:40 +00:00
Treehugger Robot
8fd129d361
[automerger skipped] Merge "Update BUILD_ID" into main am: 442e8719b9
-s ours am: a562d4abb7
-s ours am: b20f0458cb
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: Id2b7d5d491cb31a1ff4e9f99b113eaf9b1a7aed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 20:10:04 +00:00
Amith Dsouza
db65ce5ce1
[automerger skipped] Update BUILD_ID am: cab8fc9658
-s ours am: 9901306f4a
-s ours am: 0c3978717e
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: Icd0de15dfe9d66dddd52ecd068e58798b3149b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 20:10:01 +00:00
LaMont Jones
4bbf7a86af
Merge changes from topic "mod-info-foreach" into main am: e75c063d1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522
Change-Id: I9bc44b061f568b44aa72a13d6e6c2883178156cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 20:09:14 +00:00
LaMont Jones
e75c063d1f
Merge changes from topic "mod-info-foreach" into main
...
* changes:
Reduce spaces in module-info.json
use KATI_foreach_sep in module-info.json rules
2023-07-13 19:36:02 +00:00
Treehugger Robot
fbd3468d1e
Merge "Update BUILD_ID" into aosp-main-future am: 33e1da8114
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24045736
Change-Id: I5a21ee61ed1ef3fc426b6fea649362356026e9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 19:06:39 +00:00
Treehugger Robot
b20f0458cb
[automerger skipped] Merge "Update BUILD_ID" into main am: 442e8719b9
-s ours am: a562d4abb7
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: Ic5fd113d264c2dc4f5dc5ec5791aa6142852c0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 19:05:06 +00:00
Amith Dsouza
0c3978717e
[automerger skipped] Update BUILD_ID am: cab8fc9658
-s ours am: 9901306f4a
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: I8db34218e2e8cf7871bdb4f5d1f7f5f116ab3190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 19:05:03 +00:00
Treehugger Robot
33e1da8114
Merge "Update BUILD_ID" into aosp-main-future
2023-07-13 19:03:54 +00:00
Bassem Khalife
471d03c570
Merge "Update Security String to 2023-09-05" into udc-dev am: 4aa1623c9b
am: b25cf7d09e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24026314
Change-Id: I23a813892457a209ee07741c369493d2a44ff334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 19:02:48 +00:00
Bassem Khalife
0b8dcb72dd
Merge "Update Security String to 2023-09-05" into udc-dev am: 4aa1623c9b
am: e8a1435a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24026314
Change-Id: If919fa2b7ffa51b3a352887d70f81383399eab9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 19:01:29 +00:00
Treehugger Robot
a562d4abb7
[automerger skipped] Merge "Update BUILD_ID" into main am: 442e8719b9
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: I00fc15c3bf0202d8d3aa765873825264685cb9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 17:54:46 +00:00
Amith Dsouza
9901306f4a
[automerger skipped] Update BUILD_ID am: cab8fc9658
-s ours
...
am skip reason: Merged-In Ieb8b84d340f2308255ad2f23e5ac23635fb680de with SHA-1 e728051f12
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2650370
Change-Id: I57ff03d8df41c28b1b61abba7b452858d87c25b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 17:54:43 +00:00
Bassem Khalife
b25cf7d09e
Merge "Update Security String to 2023-09-05" into udc-dev am: 4aa1623c9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24026314
Change-Id: Iee7192d2c7703f168e2bf296f01d434df828e003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 17:33:43 +00:00
Bassem Khalife
e8a1435a39
Merge "Update Security String to 2023-09-05" into udc-dev am: 4aa1623c9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24026314
Change-Id: I6bf78e081e09833471099cd13422695949cdf8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 17:33:23 +00:00
Dennis Shen
9c1a675518
Merge "aconfig: add c codegen" into main am: afd8b2d75b
am: 24ecb48d89
am: f91df0cd73
am: 008d729b86
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700
Change-Id: I648ecefb1a91d8e3c48bab68aaacde7a23fb9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 17:12:24 +00:00
Treehugger Robot
442e8719b9
Merge "Update BUILD_ID" into main
2023-07-13 17:02:31 +00:00
Bassem Khalife
4aa1623c9b
Merge "Update Security String to 2023-09-05" into udc-dev
2023-07-13 16:43:43 +00:00
Dennis Shen
008d729b86
Merge "aconfig: add c codegen" into main am: afd8b2d75b
am: 24ecb48d89
am: f91df0cd73
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700
Change-Id: I973f5fd0d11a97d92fa795b074ff9a922b6065dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 16:05:32 +00:00
Dennis Shen
f91df0cd73
Merge "aconfig: add c codegen" into main am: afd8b2d75b
am: 24ecb48d89
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700
Change-Id: I75ec79309eec955f23b9d1dc9fc9ad72aff19985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 15:21:20 +00:00
Dennis Shen
24ecb48d89
Merge "aconfig: add c codegen" into main am: afd8b2d75b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700
Change-Id: Id128c68dfa1b48bcc0a15d85423cd04bc31b42ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 14:35:04 +00:00
Dennis Shen
afd8b2d75b
Merge "aconfig: add c codegen" into main
2023-07-13 13:55:10 +00:00
Dennis Shen
7321f4f6f1
aconfig: add c codegen
...
c codegen can be done at the same time with cpp codegen, the idea is to
create a c compatible header that defines the flag apis, including flag
override apis for test. then in the corresponding cpp file, the
implementation simply calls into cpp api.
c header supports static method interface, and unit test override, but
it does not support injection pattern compared to cpp header
Bug: b/279483801
Test: atest aconfig.test
Change-Id: Ie62b76d6524e443de5d3c2f9000f7f66623ab571
2023-07-13 13:55:06 +00:00
Jooyung Han
e4a7c0b617
Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e
am: 18485d30c4
am: 11f325c716
am: 9894a2b449
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667
Change-Id: I4d15f1299d3d860b9d75f2b2ea64943d2c95e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 03:35:39 +00:00
Neha Jain
4efaa94371
Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4
am: dffb22be1e
am: df039120bc
am: e4098f4648
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823
Change-Id: If32b2f5c1e8c60871f51d7877624d4da7276d142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 03:33:31 +00:00
Jooyung Han
9894a2b449
Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e
am: 18485d30c4
am: 11f325c716
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667
Change-Id: I157fc86cdf370391f84d3bb8f32bc5d4ab95e675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 02:49:48 +00:00
Neha Jain
e4098f4648
Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4
am: dffb22be1e
am: df039120bc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823
Change-Id: I8eb0e4c7cceb3d4d7b2b21ebfea57682ad42b0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 02:47:36 +00:00
Jooyung Han
11f325c716
Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e
am: 18485d30c4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667
Change-Id: I79dc3b44c7d7281697e3b363ec96a0473e11364a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 02:05:36 +00:00
Neha Jain
df039120bc
Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4
am: dffb22be1e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823
Change-Id: I04922e36d86892a3c22b9fb94151e0e63f777245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 02:05:04 +00:00
Jooyung Han
18485d30c4
Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667
Change-Id: I92d6a88a456315fb2f715b6e69c75976450245dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 02:02:52 +00:00
Jooyung Han
b51bc1c77e
Merge changes I16be0dcb,I4656d43d,I52b831df into main
...
* changes:
Do not install required modules from order-only deps
Install vintf_fragments/init_rc along with targets
Install vintf_fragments even when they are shared
2023-07-13 01:29:47 +00:00
Neha Jain
dffb22be1e
Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823
Change-Id: I6f426bafe7ad8b1bdc0f30b52ad5126d855f4067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 01:18:50 +00:00
Wei Li
8eba88b57f
[automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675
am: d9b0ad6622
-s ours
...
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 fa2d551da5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: If61ae26fd623418871ccca397c3f564a906c40ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 01:15:56 +00:00
Wei Li
b66fee9f61
[automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed
am: e7dd6b56a8
-s ours
...
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 9b22820150
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570
Change-Id: I0dd6ca3df7a1e5841cdaefc4a7527f20c0c62209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 01:15:54 +00:00
Wei Li
e2b416afd3
[automerger skipped] Include static libraries information in Android SBOM. am: ccf5023a1e
am: 7e3e842f07
-s ours
...
am skip reason: Merged-In Ie2365d79ba24910b7ace132b578589be10a17d78 with SHA-1 ccf5023a1e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029569
Change-Id: I11db692918a3faef239a8da123397749cf799d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 01:15:49 +00:00
Wei Li
62afe540be
[automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675
-s ours am: 0b48880ac3
-s ours
...
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: I2799300481eb49d854c47388d17d939bd12f22e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:57:50 +00:00
Wei Li
78fe3e3a4a
[automerger skipped] Revert "Revert "Support SBOM generation of m build unbundled APEXs."" am: fa2d551da5
-s ours am: 32a7243965
-s ours
...
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: I0835cad601488ade3f8ba0e9630889cc29dcd12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:57:48 +00:00
Wei Li
e43126e96e
[automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed
-s ours am: 4ad74ae60e
-s ours
...
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570
Change-Id: If9b3264e3130f91d359f74aa29666322344bb9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:57:44 +00:00
Wei Li
6b2eea8260
[automerger skipped] Support SBOM generation of m build unbundled APEXs. am: 9b22820150
-s ours am: 72bfcb85e3
-s ours
...
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570
Change-Id: I9be20624fa84022941a679920cfd1693ff465394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:57:41 +00:00
Wei Li
d9b0ad6622
Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: I8d252b65fa6c79b7cd5634a2eb5b50005209e892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:35:58 +00:00
Wei Li
e7dd6b56a8
Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570
Change-Id: I3e759a281920bd7dce323646de9210201e3d2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:35:53 +00:00
Wei Li
7e3e842f07
Include static libraries information in Android SBOM. am: ccf5023a1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029569
Change-Id: I25b0c963047450dd61b22457fc8739b54fe96211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:35:51 +00:00
Wei Li
0b48880ac3
[automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675
-s ours
...
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: Idc388b6218df82db16e81998a414d8d74c965351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:34:02 +00:00
Wei Li
32a7243965
[automerger skipped] Revert "Revert "Support SBOM generation of m build unbundled APEXs."" am: fa2d551da5
-s ours
...
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007
Change-Id: I073aa249313f09850a245b2c707f5e163b10a3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-13 00:33:57 +00:00