summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add more DNS providers [1/3]HEADt13.0minaripenguin372022-11-031-0/+21
| | | | | | Change-Id: I4e0576f629292cd192eec5b751def84ed65a9127 Signed-off-by: minaripenguin37 <alexfinhart@gmail.com> Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
* Add AdGuard DNS as a private DNS providerShevT2022-11-031-0/+7
| | | | | | | Co-authored-by: Chirayu Desai <chirayudesai1@gmail.com> Co-authored-by: Adam Lawson <adamjlawson22@gmail.com> Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: Ibea0fde342a934691f94674a6eab52f9ce0cc1c2
* Add Cloudflare DNS as a private DNS providerChirayu Desai2022-10-261-0/+7
| | | | | | TODO: Add tests Change-Id: I7e8a320d47e7c5ddbcb9acfaf23032ae92d5d70d
* Snap for 8750293 from b5b90714ed2862a188e08434ae50cf448b34ec12 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-216-42/+173
|\ | | | | | | Change-Id: Ibdb9ce34f93c6285a908e27bf5cb21fa339422d6
| * support per-map/prog selinux context and cross .o map sharing am: 5076d37ac5Maciej Żenczykowski2022-06-212-22/+68
| |\ | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/19009118 Change-Id: I650177daea7e409685e8e86cf0cbdfb597090047 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * support per-map/prog selinux context and cross .o map sharingMaciej Żenczykowski2022-06-212-22/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested in pieces in aosp/master and it still successfully boots. So the struct extension infrastructure works as desired. This is a sqaush of 2 aosp/master commits: 64005dd91b0cf1722ccd1767f805e0524010920e a5c641141ff74bba025a65451628308c6cbb7e0f Ignore-AOSP-First: squash of 2 aosp/master patches Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I7136253086eaccf79cf39e7a0143b425a1019390
| * | BpfMap - add BpfMapRO.init() support am: 5d99d148f1Maciej Żenczykowski2022-06-211-18/+29
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992757 Change-Id: I4b338e533ede4cdf45044684af90f2b32e8e206d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * BpfMap - add BpfMapRO.init() supportMaciej Żenczykowski2022-06-211-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Really we need to fix the inheritance to make BpfMapRO the parent class of BpfMap: but that's a far more difficult thing to do, so in the short term we punt like this. This makes BpfMapRO a little bit more usable, and allows a slow transition across the codebase... Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I1c5112db70e9e523c113cba536fbe19422b4d3f3 (cherry picked from commit b54659706758641a0ff01770644cb189e3959b29) Merged-In: I1c5112db70e9e523c113cba536fbe19422b4d3f3
| * | Merge "bpf_helpers.h - add #define's for S/T bpfloader versions" into tm-dev ↵Maciej Żenczykowski2022-06-211-0/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 6025f4716c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992753 Change-Id: I736151360d497b150cc422e092f71c52a3bfffce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "bpf_helpers.h - add #define's for S/T bpfloader versions" into tm-devMaciej Żenczykowski2022-06-211-0/+11
| | |\
| | | * bpf_helpers.h - add #define's for S/T bpfloader versionsMaciej Żenczykowski2022-06-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (by request from Lorenzo) Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I802d2aae8b103375d7cbe0ed5c35f0abf6c04ac9 (cherry picked from commit 974ee86ff71fdfaaa0305d1623efcef1d9a16b21) Merged-In: I802d2aae8b103375d7cbe0ed5c35f0abf6c04ac9
| * | | BpfMap key/value access size verification am: 02869ff64eMaciej Żenczykowski2022-06-212-9/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992756 Change-Id: I4a4ce3d5e2198c09dd3d09f4406dfa9e60f35413 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | BpfMap key/value access size verificationMaciej Żenczykowski2022-06-212-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (beginning there of) Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ie7cf8cd51b4e272fc76a281df6231ed27955ed3f (cherry picked from commit 62315472e581ea119fb8f44d3a03b41a8ca80b3b) Merged-In: Ie7cf8cd51b4e272fc76a281df6231ed27955ed3f
| * | | cache kernelVersion(), make isAtLeastKernelVersion() cheaper am: 76286d5800Maciej Żenczykowski2022-06-212-2/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992754 Change-Id: If0ff3d3ec2fdef12bf12d71aba909b1a0e458da4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | cache kernelVersion(), make isAtLeastKernelVersion() cheaperMaciej Żenczykowski2022-06-212-2/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not perfect due to this being in a header file, so multiple copies potentially exist, but it's really simple, and works nearly as well. Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Id90c6933d57bc12f4dd640c8918fd0885c7474cf (cherry picked from commit 9d481287aa69200a36c997200e71232b77234b0a) Merged-In: Id90c6933d57bc12f4dd640c8918fd0885c7474cf
* | | Snap for 8746606 from a35d0912a3ff9bb6a574014fde50ec5dc63ca036 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-201-1/+1
|\| | | | | | | | | | | Change-Id: I7d80c4578c51fc9d5bf7692bba46b48558a3e22c
| * | BpfMap: simplify .init() mMapFd assignment am: 1cd56433b6Maciej Żenczykowski2022-06-201-1/+1
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992755 Change-Id: I1a5f6b4c769f5748ee5897eecc7501948fb4a6db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * BpfMap: simplify .init() mMapFd assignmentMaciej Żenczykowski2022-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way is more obviously not calling dup_with_cloexec Bug: 218408035 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4e1ce3b0a42ccea638332ae451e291e025d57895 (cherry picked from commit 703e4682444dcab121f9657dc5c1605a7bcce65e) Merged-In: I4e1ce3b0a42ccea638332ae451e291e025d57895
* | | Snap for 8736028 from cde63b5b82ec44cffbe1d947771b57e7509c6291 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-1631-15/+1535
|\| | | | | | | | | | | Change-Id: If7cf01db858b4d655fd08fa6e52f74cda2ece526
| * | Add an int constant for CLAT_MARK and freeze INetd v10. am: 7841742981Lorenzo Colitti2022-06-1617-5/+738
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18922570 Change-Id: Ie53dff6f83cda0adfffdde1832c02d3b639f0b58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Add an int constant for CLAT_MARK and freeze INetd v10.Lorenzo Colitti2022-06-1617-5/+738
| | | | | | | | | | | | | | | | | | | | | | | | Test: m Bug: 235778483 Change-Id: I45a0bd6be39022a913bc6cff8216df0b6559cd4b (cherry picked from commit 80664c52df2cf24fa4332084586324fd4a93de81) Merged-In: I45a0bd6be39022a913bc6cff8216df0b6559cd4b
| * | Freeze netd_aidl_interface V9 am: 2ddee2b3f9Hungming Chen2022-06-1617-15/+802
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18922573 Change-Id: I22f81e6acb70b2cdd53406b37e43d4f12ad8cb58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Freeze netd_aidl_interface V9Hungming Chen2022-06-1617-15/+802
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate APIs which were moved the implementation to mainline module. - clatdStart (since T) - clatdStop (since T) - tetherOffloadRuleAdd (since S) - tetherOffloadRuleRemove (since S) - tetherOffloadGetStats (since S) - tetherOffloadSetInterfaceQuota (since S) - tetherOffloadGetAndClearStats (since S) Bug: 212345928 Test: cd system/netd; atest Change-Id: I7916512c7174a7b50833036bc89df37a266ca67e (cherry picked from commit 7b29319fcfeed3f9423fd583da705bf35ed34126) Merged-In: I7916512c7174a7b50833036bc89df37a266ca67e
* | | Snap for 8717261 from 78eed8e86b4b8fd7af372a096f00d738f05c1157 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-131-1/+1
|\| | | | | | | | | | | Change-Id: I71b5f7f43f654ef2f4ebbf0a4ffe57573af1a715
| * | Fix DevSdkIgnoreRule target SDK annotation processing. am: 9e1d090715Lorenzo Colitti2022-06-131-1/+1
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18807155 Change-Id: Ia06ca5adf3fbf852b52f5a4fb65a4a5c655075a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Fix DevSdkIgnoreRule target SDK annotation processing.Lorenzo Colitti2022-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code added to DevSdkIgnoreRule to process the max target SDK annotations in aosp/2110064 was incorrect. It is trying to match the annotation name, but ::class.simpleName returns something like Proxy$3, not the actual name of the annotation. Use annotationClass.simpleName instead, which actually works. This was not caught in aosp/2110064 because it contained an even worse error which broke DevSdkIgnoreRule completely. That was fixed in aosp/2114653. Bug: 233553525 Test: LinkPropertiesTest#testExcludedRoutesDisabled passes on user build Change-Id: If9220e5ef00fafea556604b251b2106d15d063f8 (cherry picked from commit 3af9b34bad03ac0a7ad061bac64a1ace9e1aac7a) Merged-In: If9220e5ef00fafea556604b251b2106d15d063f8
* | | Snap for 8710303 from 5014bdb07ca3341a97003099a0f65fe6e17b4963 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-111-3/+18
|\| | | | | | | | | | | Change-Id: Icf049284b45331eda22a34de7a31b2a52d00b6e3
| * | Add handlePacketReadError method in FdEventsReader. am: becbc679e6Xiao Ma2022-06-101-3/+18
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18815967 Change-Id: Ic2a3aea66ad4c7e2c4c33c63a39ad81bd9e2780c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Add handlePacketReadError method in FdEventsReader.Xiao Ma2022-06-091-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method allows the subclasses of FdEventsReader to decide whether it should stop reading packet and unregister the fd immediately or just ignore when some specific error other than EAGAIN or EINTR happens such as ENOBUFS. Bug: 232680956 Test: m Merged-In: I19ee9390e78dcd0140e45fed75a1a36942450407 Change-Id: I19ee9390e78dcd0140e45fed75a1a36942450407
* | | Snap for 8698555 from a42ee4d17cdde71b65456d3569ed0004aebc34af to tm-d1-releaseAndroid Build Coastguard Worker2022-06-082-1/+17
|\| | | | | | | | | | | Change-Id: I049b89d6d6905051bd86f3458f4f2a06d1ce5a1f
| * | BpfMap: introduce resetMap(type, entries, flags) am: 7f63f0ff80Maciej Żenczykowski2022-06-081-0/+17
| |\| | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18694820 Change-Id: I0621c1824c40d53335dd560bb22a3cf92583a033 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * BpfMap: introduce resetMap(type, entries, flags)Maciej Żenczykowski2022-06-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to replace less safe uses of BpfMap.reset(create(type, keysize, valuesize, entries, flags)) Meant to be used in tests only. Bug: 235286176 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I869f1f935bcf5d00702c42bc46d6094ea552addc (cherry picked from commit d2dec08c73b2bc1dd2a3969ccb504a59e9cb223f) Merged-In: I869f1f935bcf5d00702c42bc46d6094ea552addc
| * | Merge "Make net-utils-device-common-bpf only available for module and tests" ↵Maciej Żenczykowski2022-06-081-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | into tm-dev am: 3aea21bcd8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18694813 Change-Id: Ia03752a6c26f7c8b77c35114dced074a1047b274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "Make net-utils-device-common-bpf only available for module and tests" ↵Maciej Żenczykowski2022-06-081-1/+0
| | |\ | | | | | | | | | | | | into tm-dev
| | | * Make net-utils-device-common-bpf only available for module and testsMark Chien2022-06-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | net-utils-device-common-bpf is design for connectivity module only, change the visibility to avoid someone outside of the module use it inadvertently. Bug: 234160319 Change-Id: I3c7c48b60414f19bad8be0bda38ea5af3dc99c86 Test: TH (cherry picked from commit 72cd1a9ef29d2b908f8ad066b84b4a0f17cc2de7) Merged-In: I3c7c48b60414f19bad8be0bda38ea5af3dc99c86
* | | | Snap for 8680719 from 6b718dd67f95af57574d2f0a4af7de7c78fbb4c3 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-042-0/+193
|\| | | | | | | | | | | | | | | Change-Id: I8e40a8d332047b3358dbe76d624dc52be2912e1c
| * | | Add IPPrefix.contains() am: 13053d762dChiachang2022-06-032-0/+193
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18714739 Change-Id: Ieb1c85c1fb69ffd4a3d7beec3f2484b82f7494d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Add IPPrefix.contains()Chiachang2022-06-022-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper methods to check whether the specified prefix is entirely contained in this prefix, or the specified address is contained in this prefix. Bug: 184750836 Test: atest IPPrefixTest Change-Id: I838510b347ac5741c589ee8f3983111209155588 (cherry picked from commit abe2e7fab4702113df60511f4642a6277321eb20) Merged-In: I838510b347ac5741c589ee8f3983111209155588
* | | | Snap for 8676880 from 8bdf176a334f7ebd9641d733a14e1905a6b8fbb0 to tm-d1-releaseAndroid Build Coastguard Worker2022-06-023-3/+210
|\| | | | | | | | | | | | | | | Change-Id: I95df20152adf68dd4faf8422e093dd4a2546814f
| * | | Run tests using DevSdkIgnoreRule am: 0504a701acRemi NGUYEN VAN2022-06-021-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18707929 Change-Id: I7dabe8ec70cb834f114cbb03b66824696bd2d055 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Run tests using DevSdkIgnoreRuleRemi NGUYEN VAN2022-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests using DevSdkIgnoreRule are currently not being run at all, as the call to base.evaluate() was removed. Bug: 233553525 Bug: 234680138 Ignore-AOSP-First: fix urgent test breakage Change-Id: Ice2d1c85f5b886b1fcd5214046ae554d6c66134b Test: atest
| * | | Merge changes from topic ↵Nucca Chen2022-06-022-3/+164
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "cherrypicker-L41500000954817786:N47600001269435138" into tm-dev am: d831f1665e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18646027 Change-Id: I565c4a9a49a65ad60f3decdd7881f26cadcbd195 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | Merge changes from topic ↵Nucca Chen2022-06-022-3/+209
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "cherrypicker-L41500000954817786:N47600001269435138" into tm-dev * changes: DeviceInfoUtils: add class and helper for three-part version number Move DeviceInfoUtilsTest from NetworkStack to frameworks/lib/net
| | | * | DeviceInfoUtils: add class and helper for three-part version numberTreehugger Robot2022-05-282-3/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a class Version and string helper for handling a three-part kernel version number. Test: atest com.android.testutils.DeviceInfoUtilsTest Bug: 232332847 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2108204 Merged-In: I0f229e935bd8332ef2ef93fc910a576df9c054ae Change-Id: I70fedb33582a2f157b93ad0ab5be8f305feb3b21 Signed-off-by: Nucca Chen <nuccachen@google.com> (cherry picked from commit 3a7e53b03034b71985e905915d3eeb07d80b77c7)
| * | | | Move DeviceInfoUtilsTest from NetworkStack to frameworks/lib/net am: 1eb41d94a3Hungming Chen2022-06-021-0/+45
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18645582 Change-Id: I5510105ac6a31d892db59d92e884ce434d33ab8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | Move DeviceInfoUtilsTest from NetworkStack to frameworks/lib/netHungming Chen2022-05-281-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest com.android.testutils.DeviceInfoUtilsTest Change-Id: Ib45dea951980eae0c1576d37842477192539a740 (cherry picked from commit 9f26c843618aad57a27e2eff976c2ff521739fac) Merged-In: Ib45dea951980eae0c1576d37842477192539a740
* | | | | Snap for 8671908 from e9e4899984d3e43568c67851d4d34d86eef26bbf to tm-d1-releaseAndroid Build Coastguard Worker2022-06-013-6/+46
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ic9af803c99ec4040c62fa2eb9eef0e01b2478b76
| * | | | Make FdEventsReader#isRunning method as protected. am: 52bf8f5403Xiao Ma2022-06-011-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18671330 Change-Id: Iaa4760467789ad882ff0ba35ecc892dc0afd8d8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | Make FdEventsReader#isRunning method as protected.Xiao Ma2022-06-011-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows subclasses of FdEventsReader can access isRunning() method directly without maintaining its own mechanism to check if the instance of FdEventsReader is still running. Bug: 232680956 Bug: 233191218 Test: m Merged-In: Iaaa07328f9804580cc2e413b5a50c0d69d8cfb2f Change-Id: Iaaa07328f9804580cc2e413b5a50c0d69d8cfb2f
| * | | Add an annotation to skip tests if the APK has target SDK > 31. am: 29c9c33379Lorenzo Colitti2022-06-012-5/+45
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18620723 Change-Id: Ib23b4178fcd4f6d98a92f877b59d2593ba3875eb 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 2025-12-20 02:45:19 +0000