summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-02Snap for 9671667 from 320b578141ab105316ece2f1290bd668f1e682e0 to ↵aml_net_331812010aml_net_331710000android13-mainline-networking-releaseAndroid Build Coastguard Worker
mainline-networking-release Change-Id: I147945fad94d36555e971643d061167c0b87a395
2023-03-01[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am: 064418ad7b -s ours am: 46a30d4f6a -s ours am: 6fce1f1be7 -s ours am: db44648dd6 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f90 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: I4f01f0a11bf500a15febc475744a0f5832447184 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into sc-dev am: 854dac6da2 -s ours am: 3f0f4123e3 -s ours am: fe459b30f3 -s ours am: b8b17cb4bd -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: I01ed25ab2ce52e5897c199790471d0e689e5279d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] enforce stricter rules when registering phoneAccounts ↵Thomas Stuart
am: 6a02885f90 -s ours am: 675f19f078 -s ours am: 79b91ba6d0 -s ours am: 94674901e0 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: Ic77880826a55dc64ed334c403e7665b30109240f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7 am: ↵Manjeet Rulhania
90075dd1fb am: 240d62f76f am: 071bddea2d am: a0f601fcbb am: 0a7d004120 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: Ibda828bdbf584f120a045db6d934527a57ac3e26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "enforce stricter rules when registering phoneAccounts" into ↵Thomas Stuart
sc-qpr1-dev am: 6f0bdf90e2 am: 77e501084b am: a4c9a28c0e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21318377 Change-Id: I1636938e720fe49ea9d26968e53d04929075fc01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am: 064418ad7b -s ours am: 46a30d4f6a -s ours am: 6fce1f1be7 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f90 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: I9dfdaf9a5ec507698378ea746e5e3b74789aa97e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into sc-dev am: 854dac6da2 -s ours am: 3f0f4123e3 -s ours am: fe459b30f3 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: Idea1b5e2e8674af3f89172a402836f6de616cae1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] enforce stricter rules when registering phoneAccounts ↵Thomas Stuart
am: 6a02885f90 -s ours am: 675f19f078 -s ours am: 79b91ba6d0 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: Ica543f24eb47fc483bdbc2f9b354402c40515060 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7 am: ↵Manjeet Rulhania
90075dd1fb am: 240d62f76f am: 071bddea2d am: a0f601fcbb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: I6f010b7ccabe04e9fe26ec96f356d0c6482f312c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "enforce stricter rules when registering phoneAccounts" into ↵Thomas Stuart
sc-qpr1-dev am: 6f0bdf90e2 am: 77e501084b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21318377 Change-Id: If4adcabd1fe285ac49dae0de283153daa72d6ed1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am: 064418ad7b -s ours am: 46a30d4f6a -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f90 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: I9e44ec62d3d71d6a8cf4c8e6f04d32bbcd4e5fd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am: 064418ad7b -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f90 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: I5c4e5b5617f1f653963116411d7569656e7c7c70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f90 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: Ifbb1bb4e5695163f3184a683a885397ad30840fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev ↵Thomas Stuart
am: 7e58d882e3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495 Change-Id: Ic767fd6b7e53b8eae90fe1696cbbccc80e5755f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "enforce stricter rules when registering phoneAccounts" into rvc-devThomas Stuart
2023-02-28Merge "Add new capability name." into tm-mainline-prodTreeHugger Robot
2023-02-28Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2023-02-28[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into sc-dev am: 854dac6da2 -s ours am: 3f0f4123e3 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: Ieb287ac070549f475a0cedd69e38fd8c40d83153 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] enforce stricter rules when registering phoneAccounts ↵Thomas Stuart
am: 6a02885f90 -s ours am: 675f19f078 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: I856c97aaf08c86d801d21116b2fb729c88aa5581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] Merge "enforce stricter rules when registering ↵Thomas Stuart
phoneAccounts" into sc-dev am: 854dac6da2 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: I2ad5faacf115ff505ac027af4fcd1fe7d241beec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28[automerger skipped] enforce stricter rules when registering phoneAccounts ↵Thomas Stuart
am: 6a02885f90 -s ours am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 e54d365603 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21183615 Change-Id: Icac1de7cae6774b7242443795543e2925563158b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Merge "enforce stricter rules when registering phoneAccounts" into sc-devThomas Stuart
2023-02-28Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7 am: ↵Manjeet Rulhania
90075dd1fb am: 240d62f76f am: 071bddea2d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: If8e3beb284ea6ecb25351f05dfb451331e63a177 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7 am: ↵Manjeet Rulhania
90075dd1fb am: 240d62f76f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: I43096872c39e9a91a4a86fc5a7fdd67d52506400 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7 am: ↵Manjeet Rulhania
90075dd1fb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: I06752d3d5c2fe76d5e0864c811762d70e6696ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28Rely on Display#getRealSize when dumping XML hierarchy am: 74184991b7Manjeet Rulhania
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21544237 Change-Id: I44f33b2c062bf7e9ef41e7d57d506d0eab9a73d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27Merge "enforce stricter rules when registering phoneAccounts" into ↵Thomas Stuart
sc-qpr1-dev am: 6f0bdf90e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21318377 Change-Id: If13e5b5b9327c536a08d6e468f0ef91b9b02317a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-devThomas Stuart
2023-02-27Add new capability name.Kweku Adams
Rename PROCESS_CAPABILITY_NETWORK to PROCESS_CAPABILITY_POWER_RESTRICTED_NETWORK so it's clearer what the capability grants. Bug: 261999509 Test: CTS Change-Id: Ie0cc529c9154d6e3ac69d2d9e5a760a62bd7fe92 (cherry picked from commit c0f77b8cfa20b91cb5b14830bdef700ded1b661f) Merged-In: Ie0cc529c9154d6e3ac69d2d9e5a760a62bd7fe92
2023-02-27enforce stricter rules when registering phoneAccountsThomas Stuart
- include disable accounts when looking up accounts for a package to check if the limit is reached (10) - put a new limit of 10 supported schemes - put a new limit of 256 characters per scheme - put a new limit of 256 characters per address - ensure the Icon can write to memory w/o throwing an exception bug: 259064622 bug: 256819769 Test: cts + unit Change-Id: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 Merged-In: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7
2023-02-27enforce stricter rules when registering phoneAccountsThomas Stuart
- include disable accounts when looking up accounts for a package to check if the limit is reached (10) - put a new limit of 10 supported schemes - put a new limit of 256 characters per scheme - put a new limit of 256 characters per address - ensure the Icon can write to memory w/o throwing an exception bug: 259064622 bug: 256819769 Test: cts + unit Change-Id: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 Merged-In: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7
2023-02-27enforce stricter rules when registering phoneAccountsThomas Stuart
- include disable accounts when looking up accounts for a package to check if the limit is reached (10) - put a new limit of 10 supported schemes - put a new limit of 256 characters per scheme - put a new limit of 256 characters per address - ensure the Icon can write to memory w/o throwing an exception bug: 259064622 bug: 256819769 Test: cts + unit Change-Id: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 Merged-In: Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7
2023-02-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie19c62f2ce8e713eaa27e99fa6d28fe8d6379177
2023-02-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5145b5ec019b10568e811764240b3519e4057b73
2023-02-24Merge "Camera: document multiResolution raw behavior" into tm-dev am: b9aa94e390Shuzhen Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21548857 Change-Id: If0cb0ee903a5154e51e3ed61aec86535004b4583 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Camera: document multiResolution raw behavior" into tm-devShuzhen Wang
2023-02-24Limit length and number of MIME types you can set am: 3ae3406b97 am: ↵William Loh
d47de97f03 am: bcd7713fad am: b160218b16 am: 57d99cca61 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19785208 Change-Id: I3fc946ebbcfc9a6c3ccf41689bae1891659d9f23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: ↵TreeHugger Robot
62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: 06aa91e2ea am: 33a8d8ea07 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545 Change-Id: I14a85939ce1afe5c28800e0ece6a142d4660ad0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 ↵Hao Ke
am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: 6edc8b7cda am: c5ed605d04 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519 Change-Id: I57dfd8d90e135525d7aead791858ce1b9780c7ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Limit length and number of MIME types you can set am: 3ae3406b97 am: ↵William Loh
d47de97f03 am: bcd7713fad am: b160218b16 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19785208 Change-Id: Ie2377cac2e24f119ab635191bad727f54a3d686a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: ↵TreeHugger Robot
62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: 06aa91e2ea Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545 Change-Id: I36dce163875852b3e9f21b0524f2dfe02f3f44dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 ↵Hao Ke
am: 64e4cbc1d8 am: ac02d51ea3 am: c3cde6206d am: 926e1629cb am: 6edc8b7cda Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519 Change-Id: Ie5b539d8b78ca5f3163564a9943a3921c425eaa6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service ↵Rhed Jao
via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours am: 5211157050 -s ours am: adfa1235d2 -s ours am: e3353ec3af -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: I32aa42ef95f0b3d1809621785fccdc84af47b66c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] [DO NOT MERGE] Fix permanent denial of service via ↵Rhed Jao
setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours am: 83ca24a005 -s ours am: 92bc927537 -s ours am: b44cfa58e4 -s ours am: d16d6dbcbe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: I7c1f8f48992962eddb2b53e69e7332ad3afadc1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service ↵Rhed Jao
via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 am: 6fa037454b -s ours am: 0e9238a6a9 -s ours am: 27af00c2a3 -s ours am: 325909f89f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344 Change-Id: Ia6534a227096f25411bfd42774f20b1f8ec3e8fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] [DO NOT MERGE] Fix permanent denial of service via ↵Rhed Jao
setComponentEnabledSetting am: 5e98f26759 am: 2246ebbdd2 -s ours am: 38d3bfcc1e -s ours am: b976c654de -s ours am: 5636b82e21 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344 Change-Id: Ice6eca366d55d2ea29c17e655b4b4e5f5721d021 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service ↵Rhed Jao
via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: a5dc5de43c -s ours am: 1fd29425f8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I8effd02af281fd31edcabfa588674e177a8c3975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into ↵Rhed Jao
sc-mainline-prod am: f6c1d6f7f2 am: 80b8dfffb6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I5162c1a3a3210a1878bfea7e4475f3283d9a6be3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23[automerger skipped] [automerge] [DO NOT MERGE] Fix permanent denial of ↵Rhed Jao
service via setComponentEnabledSetting 2p: 2447359037 am: f16c3d6883 -s ours am: 3405520b80 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I0eafd280c61ec9712d507f998c92a03021718d95 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-08 11:09:20 +0000