Martin Storsjo
2e3b0f47e2
Update the list of paths in EXTRA_DIST
...
The directory libSBRdec/src/arm is no longer available since
ef864daeea
.
A couple new test files have been added.
2023-12-21 13:06:28 +02:00
Martin Storsjo
4753071b9c
ci: Do "apt-get update" before installing anything
...
The existing package listings may be stale and pointing at files
that no longer are present.
2023-12-21 12:49:04 +02:00
Martin Storsjo
5fd541491b
Merge remote-tracking branch 'aosp/main'
2023-12-21 12:40:09 +02:00
Romain Beauxis
c16d5d72c9
Add build support for s390x
2023-12-05 23:01:29 +02:00
Martin Storsjo
8264e376ea
Saturate additions in getEnvSfbEnergy in SBR encoding
...
This avoids wraparounds, which can trigger failed asserts with
some inputs. This fixes
https://github.com/mstorsjo/fdk-aac/issues/158 .
The implementation of saturated addition loses the contents of the
lowest bit though, thus this change affects the output - but the
change is said to be acceptable.
2023-11-10 11:43:44 +02:00
Martin Storsjo
4de681c193
cmake: Update the description of the BUILD_PROGRAMS option
2023-10-06 16:36:12 +03:00
Martin Storsjo
da5c4f8143
gitignore: Ignore files with a ~ suffix
...
These can be generated as "configure~" when running autoreconf.
2023-10-06 16:35:30 +03:00
Martin Storsjo
6a7c02556a
gitignore: Add the new test-encode-decode tool
2023-10-06 16:34:49 +03:00
Martin Storsjo
ecb781c5af
Remove duplicate AACDECODER_LIB_VL*
...
This was applied upstream in 7cb7d8c181
.
2023-10-06 16:16:43 +03:00
Martin Storsjo
0f91e9ba60
Merge remote-tracking branch 'aosp/main'
2023-10-06 15:19:55 +03:00
Martin Storsjo
0bfca3e06a
ci: Run tests, add sanitizer build configurations that run tests too
2023-10-06 15:10:42 +03:00
Martin Storsjo
8ac2f359c6
Add a script for doing very rudimentary regression testing
...
This is expected to fail if the encoder is updated in a way
that changes its output; in such cases, the test references need
to be updated.
2023-10-06 14:49:50 +03:00
Martin Storsjo
1fbe8eb3bd
Add a tool for testing decoding+encoding in a number of configurations
2023-10-06 14:49:49 +03:00
Martin Storsjo
226848a2a1
cmake: Link the library as C, not C++
...
This matches how it is done in the autotools build. We try not to
rely on the C++ standard library, and this makes sure that this
property is maintained (even if developing with CMake).
2023-10-06 14:49:48 +03:00
Martin Storsjo
48255d057a
github: Add -Wno-stringop-overflow to the GCC/CMake builds
...
CMake builds with -O3 by default, while autotools builds with -O2.
When optimizing in -O3 mode, GCC finds things to warn about with
-Wno-stringop-overflow that it doesn't find in -O2 mode. (This
happens at least with GCC 11, found in Ubuntu 22.04.)
2023-10-06 14:04:10 +03:00
Martin Storsjo
23b030f80e
ci: Disable warnings about deprecated functions on macOS
...
macOS has marked the function vsprintf deprecated; this is used in
FDKsprintf with a number of uses in the codebase, that aren't
entirely trivial to move over to vsnprintf.
2023-10-06 14:04:10 +03:00
Martin Storsjo
fc773cca67
ci: Update the llvm-mingw job to the latest version
2023-10-06 14:04:10 +03:00
Martin Storsjo
daaebe6a03
ci: Update the checkout steps to the latest, non deprecated version
2023-10-06 14:04:09 +03:00
Xin Li
4e00b07669
Merge "Merge Android 14" into main am: 5543791bdc
am: e656b1df09
am: 8740c0225a
am: ca0a82b00d
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2776404
Change-Id: I5fb807c77a2ef521df291868f3e367eb674ff4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:53 +00:00
Xin Li
ca0a82b00d
Merge "Merge Android 14" into main am: 5543791bdc
am: e656b1df09
am: 8740c0225a
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2776404
Change-Id: I867b64d8c68b4edabb79bd5010f1148adf3e9556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:51:03 +00:00
Xin Li
8740c0225a
Merge "Merge Android 14" into main am: 5543791bdc
am: e656b1df09
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2776404
Change-Id: Ie1233a2d88849ca4cc8a579e5393a4f87f2ca025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:27 +00:00
Xin Li
e656b1df09
Merge "Merge Android 14" into main am: 5543791bdc
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2776404
Change-Id: Ie3d435df307adf840645785fde7b5d7363663216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:23 +00:00
Xin Li
5543791bdc
Merge "Merge Android 14" into main
2023-10-06 05:38:52 +00:00
Xin Li
7a4a08dbf0
Merge Android 14
...
Bug: 298295554
Merged-In: I206973e0bb21140865efffd930e39f920f477359
Change-Id: Ic25a4d2ce82788e0f07d1e5de0f76c780977b180
2023-10-05 15:36:59 -07:00
Xin Li
5698339f09
[automerger skipped] Merge Android U (ab/10368041) am: ff7af5c8e6
-s ours am: 5a494cb19d
-s ours am: 2c67e4be56
-s ours
...
am skip reason: Merged-In Icf5305a7da47fb85235f428151f2fed10f4aa2f4 with SHA-1 820482ff3f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/24181617
Change-Id: Ie65dd3e8b04ce8bd672f6b10d553ca0fe99a3295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:11:12 +00:00
Xin Li
2c67e4be56
[automerger skipped] Merge Android U (ab/10368041) am: ff7af5c8e6
-s ours am: 5a494cb19d
-s ours
...
am skip reason: Merged-In Icf5305a7da47fb85235f428151f2fed10f4aa2f4 with SHA-1 820482ff3f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/24181617
Change-Id: Ibb561b2cd05103b265e643d3cf0cb02846546f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:29 +00:00
Xin Li
5a494cb19d
[automerger skipped] Merge Android U (ab/10368041) am: ff7af5c8e6
-s ours
...
am skip reason: Merged-In Icf5305a7da47fb85235f428151f2fed10f4aa2f4 with SHA-1 820482ff3f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/24181617
Change-Id: I581dd4e3327870449926487ed3d04d22f2c8cbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:29 +00:00
Xin Li
ff7af5c8e6
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: Icf5305a7da47fb85235f428151f2fed10f4aa2f4
Change-Id: I1d3004de1db114ad88224d8b7d4aaeec0d1fe23d
2023-08-14 15:36:13 -07:00
Treehugger Robot
050077eafb
Merge "Updated fuzz_config in Android.bp file" am: e1495c9ec5
am: 6144fcd3a6
am: d5b80a23c2
am: 820482ff3f
am: b168e56d18
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2471984
Change-Id: I57a858e7fa79fabb1faa10404e6ad69acf7486f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 10:17:27 +00:00
Treehugger Robot
b168e56d18
Merge "Updated fuzz_config in Android.bp file" am: e1495c9ec5
am: 6144fcd3a6
am: d5b80a23c2
am: 820482ff3f
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2471984
Change-Id: Ie7824b8fd057d6b383617fe64c7e554b6dcc6348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 09:39:37 +00:00
Treehugger Robot
820482ff3f
Merge "Updated fuzz_config in Android.bp file" am: e1495c9ec5
am: 6144fcd3a6
am: d5b80a23c2
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2471984
Change-Id: Icf5305a7da47fb85235f428151f2fed10f4aa2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 08:54:35 +00:00
Treehugger Robot
d5b80a23c2
Merge "Updated fuzz_config in Android.bp file" am: e1495c9ec5
am: 6144fcd3a6
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2471984
Change-Id: I3e88cc494864e50a9aba55368abd2aa68ba0daa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 08:06:15 +00:00
Treehugger Robot
6144fcd3a6
Merge "Updated fuzz_config in Android.bp file" am: e1495c9ec5
...
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2471984
Change-Id: I3ab0c566dcf14ff9edad899eb0cd5818d2211a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 07:27:40 +00:00
Treehugger Robot
e1495c9ec5
Merge "Updated fuzz_config in Android.bp file"
2023-06-19 06:50:16 +00:00
Fraunhofer IIS FDK
25056b2254
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 451762ca48
-s ours am: 990f402bdf
-s ours am: de6ed2f433
-s ours am: f2c0c8722a
-s ours am: 51901eb166
-s ours am: 1985b858ab
-s ours am: 11fe84eaf8
-s ours am: 0c859a510a
-s ours am: afd7d151c0
-s ours am: 58b6ac2aaf
-s ours am: 10d49dfb82
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 46c53ba0cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497456
Change-Id: If2cffb48fda89f0017b6eaddb83795b9ac5f115d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:48 +00:00
Fraunhofer IIS FDK
1ec7acbce4
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 46c53ba0cb
-s ours am: e65291ead7
-s ours am: ec5f76e522
-s ours am: 867b8e1f77
-s ours am: 4af68e31b3
-s ours am: 2012fb9340
-s ours am: 4fe922ff76
-s ours am: 81771bec91
-s ours am: d31464f826
-s ours am: 2d1868bf99
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 173576b2b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497460
Change-Id: I1ef9db17b64fdfe40959be64da62b8927ee01fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:40 +00:00
Fraunhofer IIS FDK
d463a4c933
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3
-s ours am: 2297b69943
-s ours am: daa7312ce2
-s ours am: 8fa3cb2888
-s ours am: 7e3afbb85d
-s ours am: 64809622b6
-s ours am: 2bc1bd163d
-s ours am: 39a6d184f1
-s ours am: 2b9ac3ba72
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466
Change-Id: Id06d8d88ed513f1b272a169094b6dc29827256a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:34 +00:00
Fraunhofer IIS FDK
3767e9eedd
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed
-s ours am: ae3186940a
-s ours am: 7c0b490f6b
-s ours am: 6611abd75d
-s ours am: c0228e20b7
-s ours am: ff72e4b39d
-s ours am: 84ca152914
-s ours am: 244dcb7b05
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: I38c4a2c0bc276618b25f4bbf63226eac16ee1e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:29 +00:00
Fraunhofer IIS FDK
677ab0401d
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: cd6f219861
-s ours am: 14db3e3104
-s ours am: 882e4f2180
-s ours am: d72330c0a7
-s ours am: f33b682192
-s ours am: e7e618c809
-s ours am: 5f37ea1c06
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642
Change-Id: I4f0db7440205448508ccbf8a1b9d43d94e923372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:23 +00:00
Fraunhofer IIS FDK
a086204b69
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 2f8c08a4e7
am: d71bdb8fa4
-s ours am: c933b13d82
-s ours am: f3d2f764b0
-s ours am: 4863fe5bb5
-s ours am: b9e8d2a59a
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cf141c714f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497643
Change-Id: I03103999c1ea98a150db50976efa36189ce21675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:18 +00:00
Fraunhofer IIS FDK
ccf900e1e2
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 451762ca48
-s ours am: 990f402bdf
-s ours am: de6ed2f433
-s ours am: f2c0c8722a
-s ours am: 51901eb166
-s ours am: 1985b858ab
-s ours am: 15c94964e0
-s ours am: 063f755963
-s ours am: 806ab2d0fa
-s ours am: 18a6014607
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 46c53ba0cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497456
Change-Id: Ib6d49c4d3edccda4187b5628798673959be7928c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:11 +00:00
Fraunhofer IIS FDK
3a577765b2
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 46c53ba0cb
-s ours am: e65291ead7
-s ours am: ec5f76e522
-s ours am: 867b8e1f77
-s ours am: 4af68e31b3
-s ours am: 0010ae7c45
-s ours am: aa48c8c31f
-s ours am: d94007c13b
-s ours am: c3ded5ee96
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 173576b2b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497460
Change-Id: I2a728dcdc159d6706146e10cc994749057537acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:16:05 +00:00
Fraunhofer IIS FDK
8460e11e80
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3
-s ours am: 2297b69943
-s ours am: daa7312ce2
-s ours am: 8fa3cb2888
-s ours am: 8e7379d938
-s ours am: 1052e4c46c
-s ours am: 51b0aa4739
-s ours am: 77df0f370e
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466
Change-Id: I8a374f1de63d737e593bed340e33206cd772b050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:52 +00:00
Fraunhofer IIS FDK
974224aa73
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed
-s ours am: ae3186940a
-s ours am: 7c0b490f6b
-s ours am: cc453a7a26
-s ours am: ca237e7dbe
-s ours am: 2503fd0685
-s ours am: 3a72bc5218
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: I5b2bbabca70d23e506b44a164a155e56631d654e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:40 +00:00
Automerger Merge Worker
764ec3dd5d
Merge "[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 451762ca48
-s ours am: 990f402bdf
-s ours am: de6ed2f433
-s ours am: f2c0c8722a
-s ours am: 51901eb166
-s ours am: 1985b858ab
-s ours am: 11fe84eaf8
-s ours am: 0c859a510a
-s ours am: 00e8f9d514
-s ours am: 41f22ae529
-s ours am: db033f504b
-s ours" into udc-qpr-dev-plus-aosp
2023-06-05 22:15:30 +00:00
Fraunhofer IIS FDK
59fa47ab6d
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: cd6f219861
-s ours am: 14db3e3104
-s ours am: 24ff1ff2b2
-s ours am: e4342fee79
-s ours am: 04c153c0f4
-s ours am: 933bc0164b
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 2f8c08a4e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497642
Change-Id: If9a7fb390307e2a35d3cfc1ecf03e10688e8be5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:27 +00:00
Fraunhofer IIS FDK
24295762da
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 451762ca48
-s ours am: 990f402bdf
-s ours am: de6ed2f433
-s ours am: f2c0c8722a
-s ours am: 51901eb166
-s ours am: 1985b858ab
-s ours am: 11fe84eaf8
-s ours am: 0c859a510a
-s ours am: 00e8f9d514
-s ours am: 41f22ae529
-s ours am: db033f504b
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 46c53ba0cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497456
Change-Id: I2bbfbe5fddc0299b9f2ae8f9fa92edba71111e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:27 +00:00
Fraunhofer IIS FDK
d92082dc2b
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 46c53ba0cb
-s ours am: e65291ead7
-s ours am: ec5f76e522
-s ours am: 867b8e1f77
-s ours am: 4af68e31b3
-s ours am: 2012fb9340
-s ours am: 4fe922ff76
-s ours am: 917390dbc8
-s ours am: 3b7ca1a88b
-s ours am: 2a18474070
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 173576b2b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497460
Change-Id: Iac0799bec7f8cdb5a15fc32a2c332386fe33aaca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:21 +00:00
Fraunhofer IIS FDK
b5b0e98d72
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 173576b2b3
-s ours am: 2297b69943
-s ours am: daa7312ce2
-s ours am: 8fa3cb2888
-s ours am: 7e3afbb85d
-s ours am: 64809622b6
-s ours am: 4a8fe5105e
-s ours am: bf0bcef7d7
-s ours am: 8ee6edc73e
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 35a37fd6ed
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497466
Change-Id: Ifa66266d83f38139dc34aab3eb98cb35279e2134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:15 +00:00
Fraunhofer IIS FDK
d40e2a4a86
[automerger skipped] Increase patchParam array size by one and fix out-of-bounce write in resetLppTransposer(). am: 35a37fd6ed
-s ours am: ae3186940a
-s ours am: 7c0b490f6b
-s ours am: 6611abd75d
-s ours am: c0228e20b7
-s ours am: 39a41bdb16
-s ours am: 832858bb3e
-s ours am: e59b94ad24
-s ours
...
am skip reason: Merged-In I206973e0bb21140865efffd930e39f920f477359 with SHA-1 cd6f219861
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/23497640
Change-Id: Ia8dde0a1d83cc4a79097ea633dfc642c7ff405d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 22:15:09 +00:00