StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,593 Commits 1 Branch 0 Tags
1b32c99148d1cf421a1f4a80145fa8a7a8947d6c
Commit Graph

92593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cole Faust
1b32c99148 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 am: a4b5a72af6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I75b8e1667708066e8078c3d4eb3727b758ca87a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 04:11:12 +00:00
Cole Faust
a4b5a72af6 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba am: 0273f3cd40 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I85dff2e7a0adafc771c2614d3ceff3cc83f91ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 03:13:19 +00:00
Cole Faust
0273f3cd40 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 am: 79b49a32ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: I5230030273052b79491ebf85d64568b7230a108d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 02:35:58 +00:00
Cole Faust
79b49a32ba Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c am: 62fcb3fcf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Icb542999a02db66ea698b95158ec0f2231141013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:50:24 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Xin Li
43fd03541d [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours am: 6b012b8877 -s ours am: 41b7b6fa89 -s ours am: ebf868a0a8 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: Iba2699f97efa6582c6f8a05ba046e59c0ec357c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:27:48 +00:00
Xin Li
7590066dff [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours am: b37805d761 -s ours am: a184d57a22 -s ours am: 9385c80506 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: I095fc2b904a02b67ed0dabc7cb556cb2429733c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:26:45 +00:00
Treehugger Robot
f6d2c848aa Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 am: 73039bc572 am: 70ead8ce26 am: d2b58c16a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Ic0c07092a2b993d0b48dcd3622a9f6b53459efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:18:24 +00:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set 
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
 2023-09-05 14:16:38 -07:00
Treehugger Robot
3fbd1e4f7f Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d am: f39afc4ea9 am: 15a0ac9a6a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: I26406455deda16b0778a54dd42a45147e46f1d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:12:22 +00:00
Xin Li
ebf868a0a8 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours am: 6b012b8877 -s ours am: 41b7b6fa89 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: Id4554bfcea83f3cc30b173785280122503c9d1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:08:24 +00:00
Xin Li
9385c80506 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours am: b37805d761 -s ours am: a184d57a22 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: Ib5f7021e15d43088dfa64650b2dd9bbab74ef8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:07:21 +00:00
Xin Li
41b7b6fa89 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours am: 6b012b8877 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: I615b78212d0ef249e738d6dba47eaa64acb60f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:35:28 +00:00
Xin Li
a184d57a22 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours am: b37805d761 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: I208e96d080372b9a781e8f402e7a575292f960f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:34:29 +00:00
Treehugger Robot
d2b58c16a4 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 am: 73039bc572 am: 70ead8ce26 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: I0a6afea90a59f4dc4999de7d47540b4735d16acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:18:16 +00:00
Treehugger Robot
15a0ac9a6a Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d am: f39afc4ea9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: Ie40bcaaeb3824290ed4b029555207ae53b955e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:17:18 +00:00
Xin Li
6b012b8877 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: Ie546e1d771ac609bf140d2dcb0647971e9bfcf76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:46:06 +00:00
Xin Li
b37805d761 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24624949

Change-Id: I7c01dbcac1f3b0711bc633f87659bd2495d4025f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:45:12 +00:00
Jared Duke
15e9f863ba Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 am: ae9d49b5ad am: 69f1315c08 am: d2ac33c300 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I61c125c9806658f33114dbcec89e9c499c6e00fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:44:20 +00:00
Treehugger Robot
70ead8ce26 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 am: 73039bc572 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: I8669bdd4e4a7857b3bec3399dccf29ef274c8e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:44:07 +00:00
Treehugger Robot
f39afc4ea9 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: I282f8764b829a0f7895246b0befa348ee2e738e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:43:16 +00:00
Treehugger Robot
73039bc572 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Ib1193197fb885eace7b6939837d03bdc4a6ae50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:20:45 +00:00
Treehugger Robot
b4a808523d Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: Ie67f3eed1c5b04194c9ea1ee30bb43ee89d220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:20:27 +00:00
Jared Duke
d2ac33c300 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 am: ae9d49b5ad am: 69f1315c08 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: Ic9f195bf20ac89c165979aac2732f7cc5af28ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:59:19 +00:00
Xin Li
236f2cd5e3 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:36:11 +00:00
Jared Duke
69f1315c08 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 am: ae9d49b5ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I3ad4dc7049e5d9b287054963194514ff9973f127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:14:33 +00:00
Treehugger Robot
6a5b171816 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Id1108f202bdd118455ea80f2d72f5a3ab26b1bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:48 +00:00
Treehugger Robot
61291bb9a7 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: If10df8b82643b13ebae55415b3281b20e92f59d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:08 +00:00
Treehugger Robot
6c4627369e Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main 
* changes:
  aconfig: add invariant checks for `is_fixed_read_only`
  aconfig: re-enable development with cargo
 2023-09-05 17:21:22 +00:00
Jared Duke
ae9d49b5ad Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I1db8277132485f3457c9a753f89f929437956bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 17:00:49 +00:00
Treehugger Robot
4d779cf4cd Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main 2023-09-05 16:55:20 +00:00
Jared Duke
2e2c2ab1b8 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I17e8b34094ac694729a58ef4f29333df1cc71cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 16:10:48 +00:00
Jared Duke
2674152fdc Merge "Ensure special Dalvik annotations are kept" into main 2023-09-05 15:49:17 +00:00
Jordan Demeulenaere
f3f27c5936 Enable Compose in SystemUI 
Bug: 238993727
Bug: 242040009
Test: Manual. See http://go/sysui-compose-performance-results for
details on performance analysis.
Test: Platinium tests passed on Forrest. See
 http://go/abtd-run/L56600000962427117
Ignore-AOSP-First: We need to submit this together with a bunch of other
 SystemUI CLs.

Change-Id: I62efad92bd1940db3524214eac2deef6d356c235
 2023-09-05 10:07:33 +02:00
Mårten Kongstad
21717e744e aconfig: add invariant checks for is_fixed_read_only 
Update parsed_flag::verify_fields to verify that the invariant "if a
parsed flag is_fixed_read_only, its permission must be READ_ONLY".

Note: commands.rs will ensure that no value files are used to create an
invalid parsed flag when flag declarations and values are parsed, but
the invariant check should still be added for completeness sake, and to
make sure no invalid hand-crafted test data exists.

Also fix invalid test data found by adding this invariant.

Bug: 298935897
Test: atest aconfig.test
Change-Id: I8cea5c4d28c458525b7034d78ecb34dd09272771
 2023-09-04 20:25:59 +02:00
Kiyoung Kim
243dfd4c9c Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 am: b5ad8b1e3f am: 00add245be 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: If1b99edca70319d79c510c26082e8018c8160e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 12:26:01 +00:00
Kiyoung Kim
00add245be Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 am: b5ad8b1e3f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I09335581d242b1e8dc1be9db298f564a34e15775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 11:24:28 +00:00
Mårten Kongstad
5cfad6abd2 aconfig: re-enable development with cargo 
The integration tests introduced in 906405f5c9 depend on libraries
auto-generated by running aconfig. This works fine for the Android build
system, but breaks `cargo t`.

Disable the tests when using `cargo t` for local development. Cargo can
be used for rapid local development, including running unit tests;
integration tests should be run using atest.

Bug: 298904077
Test: cargo t
Test: atest aconfig.test_mode.test.rust aconfig.prod_mode.test.rust
Change-Id: Ifcd374fa6efdc121cbfd4c4ac4fb43cf9cacc192
 2023-09-04 13:22:28 +02:00
Kiyoung Kim
b5ad8b1e3f Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I0b003e0a850da62ed13722c416bba25d6f6578ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 10:45:53 +00:00
Kiyoung Kim
000b71f387 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: Ic95343e8b504c26bd899089ced7f63526f264f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 09:55:18 +00:00
Kiyoung Kim
e68edc80c1 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 09:00:11 +00:00
Kiyoung Kim
a28e56e1cc Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main 2023-09-04 08:09:56 +00:00
Treehugger Robot
ac1535d4a7 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd am: 06da7cbec1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: Ifa2ac3a1bdad492e6a98bcf2e1a4fc160df36e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 03:02:04 +00:00
Treehugger Robot
06da7cbec1 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I05ba68038ad19a0f01be3516f986b1551ab1eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 02:00:47 +00:00
Treehugger Robot
cef69de0fd Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I49b35f28e78c8bdfe5d2253af6ec32a414e2e36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 01:23:23 +00:00
Treehugger Robot
436a85aff7 Merge "Add vndk list change history file" into udc-dev-plus-aosp 2023-09-04 00:44:29 +00:00
My Name
d19955c7b7 Bump SDK Extension version to 10 am: e30a739758 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24621554

Change-Id: I8db5e782179c3323a217ed5548d8d311b3e796ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 16:09:52 +00:00
Treehugger Robot
1e8145dd4c Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 am: b09a85e7c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I68650d0e241786e258476f8a73741cca9b011547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 03:26:51 +00:00
Treehugger Robot
b09a85e7c8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I0d6638a59b276b18edc3aa3da7f487a8f01d8e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 02:23:14 +00:00